8231186: Replace html tag <code>foo</code> with javadoc tag {@code foo} in java.base
authorjboes
Tue, 24 Sep 2019 09:43:43 +0100
changeset 58288 48e480e56aad
parent 58287 a7f16447085e
child 58289 3a79d4cccbcb
8231186: Replace html tag <code>foo</code> with javadoc tag {@code foo} in java.base Summary: Minor coding style update of javadoc tag in any file in java.base Reviewed-by: bchristi, lancea
src/java.base/share/classes/java/io/BufferedInputStream.java
src/java.base/share/classes/java/io/BufferedOutputStream.java
src/java.base/share/classes/java/io/BufferedReader.java
src/java.base/share/classes/java/io/CharArrayReader.java
src/java.base/share/classes/java/io/DataInputStream.java
src/java.base/share/classes/java/io/DataOutput.java
src/java.base/share/classes/java/io/DataOutputStream.java
src/java.base/share/classes/java/io/EOFException.java
src/java.base/share/classes/java/io/File.java
src/java.base/share/classes/java/io/FileFilter.java
src/java.base/share/classes/java/io/FileInputStream.java
src/java.base/share/classes/java/io/FileNotFoundException.java
src/java.base/share/classes/java/io/FileOutputStream.java
src/java.base/share/classes/java/io/FilePermission.java
src/java.base/share/classes/java/io/FileSystem.java
src/java.base/share/classes/java/io/FilenameFilter.java
src/java.base/share/classes/java/io/FilterInputStream.java
src/java.base/share/classes/java/io/FilterOutputStream.java
src/java.base/share/classes/java/io/FilterReader.java
src/java.base/share/classes/java/io/FilterWriter.java
src/java.base/share/classes/java/io/InputStream.java
src/java.base/share/classes/java/io/InputStreamReader.java
src/java.base/share/classes/java/io/InterruptedIOException.java
src/java.base/share/classes/java/io/InvalidObjectException.java
src/java.base/share/classes/java/io/ObjectInputStream.java
src/java.base/share/classes/java/io/ObjectOutputStream.java
src/java.base/share/classes/java/io/ObjectStreamClass.java
src/java.base/share/classes/java/io/ObjectStreamField.java
src/java.base/share/classes/java/io/OptionalDataException.java
src/java.base/share/classes/java/io/OutputStream.java
src/java.base/share/classes/java/io/OutputStreamWriter.java
src/java.base/share/classes/java/io/PipedInputStream.java
src/java.base/share/classes/java/io/PipedOutputStream.java
src/java.base/share/classes/java/io/PipedReader.java
src/java.base/share/classes/java/io/PipedWriter.java
src/java.base/share/classes/java/io/PushbackInputStream.java
src/java.base/share/classes/java/io/PushbackReader.java
src/java.base/share/classes/java/io/Reader.java
src/java.base/share/classes/java/io/SequenceInputStream.java
src/java.base/share/classes/java/io/Serializable.java
src/java.base/share/classes/java/io/SerializablePermission.java
src/java.base/share/classes/java/io/StringBufferInputStream.java
src/java.base/share/classes/java/io/StringReader.java
src/java.base/share/classes/java/io/UTFDataFormatException.java
src/java.base/share/classes/java/lang/AbstractMethodError.java
src/java.base/share/classes/java/lang/ArrayStoreException.java
src/java.base/share/classes/java/lang/AssertionError.java
src/java.base/share/classes/java/lang/ClassCastException.java
src/java.base/share/classes/java/lang/ClassFormatError.java
src/java.base/share/classes/java/lang/ClassNotFoundException.java
src/java.base/share/classes/java/lang/CloneNotSupportedException.java
src/java.base/share/classes/java/lang/Cloneable.java
src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java
src/java.base/share/classes/java/lang/ExceptionInInitializerError.java
src/java.base/share/classes/java/lang/IllegalAccessError.java
src/java.base/share/classes/java/lang/IllegalAccessException.java
src/java.base/share/classes/java/lang/IllegalArgumentException.java
src/java.base/share/classes/java/lang/IllegalMonitorStateException.java
src/java.base/share/classes/java/lang/IllegalStateException.java
src/java.base/share/classes/java/lang/IllegalThreadStateException.java
src/java.base/share/classes/java/lang/IncompatibleClassChangeError.java
src/java.base/share/classes/java/lang/InstantiationError.java
src/java.base/share/classes/java/lang/InternalError.java
src/java.base/share/classes/java/lang/InterruptedException.java
src/java.base/share/classes/java/lang/NegativeArraySizeException.java
src/java.base/share/classes/java/lang/NoClassDefFoundError.java
src/java.base/share/classes/java/lang/NoSuchFieldError.java
src/java.base/share/classes/java/lang/NoSuchMethodError.java
src/java.base/share/classes/java/lang/NoSuchMethodException.java
src/java.base/share/classes/java/lang/NumberFormatException.java
src/java.base/share/classes/java/lang/Runnable.java
src/java.base/share/classes/java/lang/RuntimePermission.java
src/java.base/share/classes/java/lang/SecurityManager.java
src/java.base/share/classes/java/lang/StackOverflowError.java
src/java.base/share/classes/java/lang/UnknownError.java
src/java.base/share/classes/java/lang/UnsatisfiedLinkError.java
src/java.base/share/classes/java/lang/UnsupportedClassVersionError.java
src/java.base/share/classes/java/lang/UnsupportedOperationException.java
src/java.base/share/classes/java/lang/VerifyError.java
src/java.base/share/classes/java/lang/VirtualMachineError.java
src/java.base/share/classes/java/lang/invoke/MethodHandles.java
src/java.base/share/classes/java/lang/invoke/package-info.java
src/java.base/share/classes/java/lang/ref/Reference.java
src/java.base/share/classes/java/text/AttributedString.java
src/java.base/share/classes/java/text/Bidi.java
src/java.base/share/classes/java/text/BreakIterator.java
src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java
src/java.base/share/classes/java/text/ChoiceFormat.java
src/java.base/share/classes/java/text/CollationElementIterator.java
src/java.base/share/classes/java/text/CollationKey.java
src/java.base/share/classes/java/text/Collator.java
src/java.base/share/classes/java/text/DateFormat.java
src/java.base/share/classes/java/text/DateFormatSymbols.java
src/java.base/share/classes/java/text/DigitList.java
src/java.base/share/classes/java/text/FieldPosition.java
src/java.base/share/classes/java/text/Format.java
src/java.base/share/classes/java/text/MessageFormat.java
src/java.base/share/classes/java/text/Normalizer.java
src/java.base/share/classes/java/text/NumberFormat.java
src/java.base/share/classes/java/text/ParsePosition.java
src/java.base/share/classes/java/text/RuleBasedCollator.java
src/java.base/share/classes/java/text/SimpleDateFormat.java
src/java.base/share/classes/java/text/StringCharacterIterator.java
src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java
src/java.base/share/classes/java/text/spi/CollatorProvider.java
src/java.base/share/classes/java/text/spi/DateFormatProvider.java
src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java
src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java
src/java.base/share/classes/java/text/spi/NumberFormatProvider.java
src/java.base/share/classes/java/time/ZoneId.java
src/java.base/share/classes/java/util/Calendar.java
src/java.base/share/classes/java/util/ConcurrentModificationException.java
src/java.base/share/classes/java/util/Currency.java
src/java.base/share/classes/java/util/GregorianCalendar.java
src/java.base/share/classes/java/util/IllformedLocaleException.java
src/java.base/share/classes/java/util/ListResourceBundle.java
src/java.base/share/classes/java/util/Locale.java
src/java.base/share/classes/java/util/PropertyPermission.java
src/java.base/share/classes/java/util/PropertyResourceBundle.java
src/java.base/share/classes/java/util/ResourceBundle.java
src/java.base/share/classes/java/util/SimpleTimeZone.java
src/java.base/share/classes/java/util/TimeZone.java
src/java.base/share/classes/java/util/TooManyListenersException.java
src/java.base/share/classes/java/util/jar/JarEntry.java
src/java.base/share/classes/java/util/jar/JarInputStream.java
src/java.base/share/classes/java/util/jar/JarOutputStream.java
src/java.base/share/classes/java/util/jar/package-info.java
src/java.base/share/classes/java/util/regex/Pattern.java
src/java.base/share/classes/java/util/regex/package-info.java
src/java.base/share/classes/java/util/spi/CalendarNameProvider.java
src/java.base/share/classes/java/util/spi/CurrencyNameProvider.java
src/java.base/share/classes/java/util/spi/LocaleNameProvider.java
src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
src/java.base/share/classes/java/util/spi/TimeZoneNameProvider.java
src/java.base/share/classes/java/util/zip/CheckedInputStream.java
src/java.base/share/classes/java/util/zip/GZIPInputStream.java
src/java.base/share/classes/java/util/zip/InflaterInputStream.java
src/java.base/share/classes/java/util/zip/ZipException.java
src/java.base/share/classes/java/util/zip/ZipInputStream.java
--- a/src/java.base/share/classes/java/io/BufferedInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/BufferedInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -29,20 +29,20 @@
 import jdk.internal.util.ArraysSupport;
 
 /**
- * A <code>BufferedInputStream</code> adds
+ * A {@code BufferedInputStream} adds
  * functionality to another input stream-namely,
  * the ability to buffer the input and to
- * support the <code>mark</code> and <code>reset</code>
- * methods. When  the <code>BufferedInputStream</code>
+ * support the {@code mark} and {@code reset}
+ * methods. When  the {@code BufferedInputStream}
  * is created, an internal buffer array is
  * created. As bytes  from the stream are read
  * or skipped, the internal buffer is refilled
  * as necessary  from the contained input stream,
- * many bytes at a time. The <code>mark</code>
+ * many bytes at a time. The {@code mark}
  * operation  remembers a point in the input
- * stream and the <code>reset</code> operation
+ * stream and the {@code reset} operation
  * causes all the  bytes read since the most
- * recent <code>mark</code> operation to be
+ * recent {@code mark} operation to be
  * reread before new bytes are  taken from
  * the contained input stream.
  *
@@ -81,23 +81,23 @@
      * The index one greater than the index of the last valid byte in
      * the buffer.
      * This value is always
-     * in the range <code>0</code> through <code>buf.length</code>;
-     * elements <code>buf[0]</code>  through <code>buf[count-1]
-     * </code>contain buffered input data obtained
+     * in the range {@code 0} through {@code buf.length};
+     * elements {@code buf[0]} through {@code buf[count-1]}
+     * contain buffered input data obtained
      * from the underlying  input stream.
      */
     protected int count;
 
     /**
      * The current position in the buffer. This is the index of the next
-     * character to be read from the <code>buf</code> array.
+     * character to be read from the {@code buf} array.
      * <p>
-     * This value is always in the range <code>0</code>
-     * through <code>count</code>. If it is less
-     * than <code>count</code>, then  <code>buf[pos]</code>
+     * This value is always in the range {@code 0}
+     * through {@code count}. If it is less
+     * than {@code count}, then  {@code buf[pos]}
      * is the next byte to be supplied as input;
-     * if it is equal to <code>count</code>, then
-     * the  next <code>read</code> or <code>skip</code>
+     * if it is equal to {@code count}, then
+     * the  next {@code read} or {@code skip}
      * operation will require more bytes to be
      * read from the contained  input stream.
      *
@@ -106,28 +106,28 @@
     protected int pos;
 
     /**
-     * The value of the <code>pos</code> field at the time the last
-     * <code>mark</code> method was called.
+     * The value of the {@code pos} field at the time the last
+     * {@code mark} method was called.
      * <p>
      * This value is always
-     * in the range <code>-1</code> through <code>pos</code>.
+     * in the range {@code -1} through {@code pos}.
      * If there is no marked position in  the input
-     * stream, this field is <code>-1</code>. If
+     * stream, this field is {@code -1}. If
      * there is a marked position in the input
-     * stream,  then <code>buf[markpos]</code>
+     * stream,  then {@code buf[markpos]}
      * is the first byte to be supplied as input
-     * after a <code>reset</code> operation. If
-     * <code>markpos</code> is not <code>-1</code>,
-     * then all bytes from positions <code>buf[markpos]</code>
-     * through  <code>buf[pos-1]</code> must remain
+     * after a {@code reset} operation. If
+     * {@code markpos} is not {@code -1},
+     * then all bytes from positions {@code buf[markpos]}
+     * through  {@code buf[pos-1]} must remain
      * in the buffer array (though they may be
      * moved to  another place in the buffer array,
      * with suitable adjustments to the values
-     * of <code>count</code>,  <code>pos</code>,
-     * and <code>markpos</code>); they may not
+     * of {@code count},  {@code pos},
+     * and {@code markpos}); they may not
      * be discarded unless and until the difference
-     * between <code>pos</code> and <code>markpos</code>
-     * exceeds <code>marklimit</code>.
+     * between {@code pos} and {@code markpos}
+     * exceeds {@code marklimit}.
      *
      * @see     java.io.BufferedInputStream#mark(int)
      * @see     java.io.BufferedInputStream#pos
@@ -136,12 +136,12 @@
 
     /**
      * The maximum read ahead allowed after a call to the
-     * <code>mark</code> method before subsequent calls to the
-     * <code>reset</code> method fail.
-     * Whenever the difference between <code>pos</code>
-     * and <code>markpos</code> exceeds <code>marklimit</code>,
+     * {@code mark} method before subsequent calls to the
+     * {@code reset} method fail.
+     * Whenever the difference between {@code pos}
+     * and {@code markpos} exceeds {@code marklimit},
      * then the  mark may be dropped by setting
-     * <code>markpos</code> to <code>-1</code>.
+     * {@code markpos} to {@code -1}.
      *
      * @see     java.io.BufferedInputStream#mark(int)
      * @see     java.io.BufferedInputStream#reset()
@@ -171,10 +171,10 @@
     }
 
     /**
-     * Creates a <code>BufferedInputStream</code>
+     * Creates a {@code BufferedInputStream}
      * and saves its  argument, the input stream
-     * <code>in</code>, for later use. An internal
-     * buffer array is created and  stored in <code>buf</code>.
+     * {@code in}, for later use. An internal
+     * buffer array is created and  stored in {@code buf}.
      *
      * @param   in   the underlying input stream.
      */
@@ -183,12 +183,12 @@
     }
 
     /**
-     * Creates a <code>BufferedInputStream</code>
+     * Creates a {@code BufferedInputStream}
      * with the specified buffer size,
      * and saves its  argument, the input stream
-     * <code>in</code>, for later use.  An internal
-     * buffer array of length  <code>size</code>
-     * is created and stored in <code>buf</code>.
+     * {@code in}, for later use.  An internal
+     * buffer array of length  {@code size}
+     * is created and stored in {@code buf}.
      *
      * @param   in     the underlying input stream.
      * @param   size   the buffer size.
@@ -249,10 +249,10 @@
 
     /**
      * See
-     * the general contract of the <code>read</code>
-     * method of <code>InputStream</code>.
+     * the general contract of the {@code read}
+     * method of {@code InputStream}.
      *
-     * @return     the next byte of data, or <code>-1</code> if the end of the
+     * @return     the next byte of data, or {@code -1} if the end of the
      *             stream is reached.
      * @throws     IOException  if this input stream has been closed by
      *                          invoking its {@link #close()} method,
@@ -300,21 +300,21 @@
      * <code>{@link InputStream#read(byte[], int, int) read}</code> method of
      * the <code>{@link InputStream}</code> class.  As an additional
      * convenience, it attempts to read as many bytes as possible by repeatedly
-     * invoking the <code>read</code> method of the underlying stream.  This
-     * iterated <code>read</code> continues until one of the following
+     * invoking the {@code read} method of the underlying stream.  This
+     * iterated {@code read} continues until one of the following
      * conditions becomes true: <ul>
      *
      *   <li> The specified number of bytes have been read,
      *
-     *   <li> The <code>read</code> method of the underlying stream returns
-     *   <code>-1</code>, indicating end-of-file, or
+     *   <li> The {@code read} method of the underlying stream returns
+     *   {@code -1}, indicating end-of-file, or
      *
-     *   <li> The <code>available</code> method of the underlying stream
+     *   <li> The {@code available} method of the underlying stream
      *   returns zero, indicating that further input requests would block.
      *
-     * </ul> If the first <code>read</code> on the underlying stream returns
-     * <code>-1</code> to indicate end-of-file then this method returns
-     * <code>-1</code>.  Otherwise this method returns the number of bytes
+     * </ul> If the first {@code read} on the underlying stream returns
+     * {@code -1} to indicate end-of-file then this method returns
+     * {@code -1}.  Otherwise this method returns the number of bytes
      * actually read.
      *
      * <p> Subclasses of this class are encouraged, but not required, to
@@ -323,7 +323,7 @@
      * @param      b     destination buffer.
      * @param      off   offset at which to start storing bytes.
      * @param      len   maximum number of bytes to read.
-     * @return     the number of bytes read, or <code>-1</code> if the end of
+     * @return     the number of bytes read, or {@code -1} if the end of
      *             the stream has been reached.
      * @throws     IOException  if this input stream has been closed by
      *                          invoking its {@link #close()} method,
@@ -355,8 +355,8 @@
     }
 
     /**
-     * See the general contract of the <code>skip</code>
-     * method of <code>InputStream</code>.
+     * See the general contract of the {@code skip}
+     * method of {@code InputStream}.
      *
      * @throws IOException  if this input stream has been closed by
      *                      invoking its {@link #close()} method,
@@ -413,8 +413,8 @@
     }
 
     /**
-     * See the general contract of the <code>mark</code>
-     * method of <code>InputStream</code>.
+     * See the general contract of the {@code mark}
+     * method of {@code InputStream}.
      *
      * @param   readlimit   the maximum limit of bytes that can be read before
      *                      the mark position becomes invalid.
@@ -426,14 +426,14 @@
     }
 
     /**
-     * See the general contract of the <code>reset</code>
-     * method of <code>InputStream</code>.
+     * See the general contract of the {@code reset}
+     * method of {@code InputStream}.
      * <p>
-     * If <code>markpos</code> is <code>-1</code>
+     * If {@code markpos} is {@code -1}
      * (no mark has been set or the mark has been
-     * invalidated), an <code>IOException</code>
-     * is thrown. Otherwise, <code>pos</code> is
-     * set equal to <code>markpos</code>.
+     * invalidated), an {@code IOException}
+     * is thrown. Otherwise, {@code pos} is
+     * set equal to {@code markpos}.
      *
      * @throws     IOException  if this stream has not been marked or,
      *                  if the mark has been invalidated, or the stream
@@ -449,13 +449,13 @@
     }
 
     /**
-     * Tests if this input stream supports the <code>mark</code>
-     * and <code>reset</code> methods. The <code>markSupported</code>
-     * method of <code>BufferedInputStream</code> returns
-     * <code>true</code>.
+     * Tests if this input stream supports the {@code mark}
+     * and {@code reset} methods. The {@code markSupported}
+     * method of {@code BufferedInputStream} returns
+     * {@code true}.
      *
-     * @return  a <code>boolean</code> indicating if this stream type supports
-     *          the <code>mark</code> and <code>reset</code> methods.
+     * @return  a {@code boolean} indicating if this stream type supports
+     *          the {@code mark} and {@code reset} methods.
      * @see     java.io.InputStream#mark(int)
      * @see     java.io.InputStream#reset()
      */
--- a/src/java.base/share/classes/java/io/BufferedOutputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/BufferedOutputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -98,15 +98,15 @@
     }
 
     /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to this buffered output stream.
+     * Writes {@code len} bytes from the specified byte array
+     * starting at offset {@code off} to this buffered output stream.
      *
      * <p> Ordinarily this method stores bytes from the given array into this
      * stream's buffer, flushing the buffer to the underlying output stream as
      * needed.  If the requested length is at least as large as this stream's
      * buffer, however, then this method will flush the buffer and write the
      * bytes directly to the underlying output stream.  Thus redundant
-     * <code>BufferedOutputStream</code>s will not copy data unnecessarily.
+     * {@code BufferedOutputStream}s will not copy data unnecessarily.
      *
      * @param      b     the data.
      * @param      off   the start offset in the data.
--- a/src/java.base/share/classes/java/io/BufferedReader.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/BufferedReader.java	Tue Sep 24 09:43:43 2019 +0100
@@ -235,22 +235,22 @@
      * <code>{@link Reader#read(char[], int, int) read}</code> method of the
      * <code>{@link Reader}</code> class.  As an additional convenience, it
      * attempts to read as many characters as possible by repeatedly invoking
-     * the <code>read</code> method of the underlying stream.  This iterated
-     * <code>read</code> continues until one of the following conditions becomes
+     * the {@code read} method of the underlying stream.  This iterated
+     * {@code read} continues until one of the following conditions becomes
      * true: <ul>
      *
      *   <li> The specified number of characters have been read,
      *
-     *   <li> The <code>read</code> method of the underlying stream returns
-     *   <code>-1</code>, indicating end-of-file, or
+     *   <li> The {@code read} method of the underlying stream returns
+     *   {@code -1}, indicating end-of-file, or
      *
-     *   <li> The <code>ready</code> method of the underlying stream
-     *   returns <code>false</code>, indicating that further input requests
+     *   <li> The {@code ready} method of the underlying stream
+     *   returns {@code false}, indicating that further input requests
      *   would block.
      *
-     * </ul> If the first <code>read</code> on the underlying stream returns
-     * <code>-1</code> to indicate end-of-file then this method returns
-     * <code>-1</code>.  Otherwise this method returns the number of characters
+     * </ul> If the first {@code read} on the underlying stream returns
+     * {@code -1} to indicate end-of-file then this method returns
+     * {@code -1}.  Otherwise this method returns the number of characters
      * actually read.
      *
      * <p> Subclasses of this class are encouraged, but not required, to
@@ -261,7 +261,7 @@
      * however, the buffer is empty, the mark is not valid, and the requested
      * length is at least as large as the buffer, then this method will read
      * characters directly from the underlying stream into the given array.
-     * Thus redundant <code>BufferedReader</code>s will not copy data
+     * Thus redundant {@code BufferedReader}s will not copy data
      * unnecessarily.
      *
      * @param      cbuf  Destination buffer
@@ -403,7 +403,7 @@
      *
      * @return    The number of characters actually skipped
      *
-     * @throws     IllegalArgumentException  If <code>n</code> is negative.
+     * @throws     IllegalArgumentException  If {@code n} is negative.
      * @throws     IOException  If an I/O error occurs
      */
     public long skip(long n) throws IOException {
--- a/src/java.base/share/classes/java/io/CharArrayReader.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/CharArrayReader.java	Tue Sep 24 09:43:43 2019 +0100
@@ -148,10 +148,10 @@
     /**
      * Skips characters.  Returns the number of characters that were skipped.
      *
-     * <p>The <code>n</code> parameter may be negative, even though the
-     * <code>skip</code> method of the {@link Reader} superclass throws
-     * an exception in this case. If <code>n</code> is negative, then
-     * this method does nothing and returns <code>0</code>.
+     * <p>The {@code n} parameter may be negative, even though the
+     * {@code skip} method of the {@link Reader} superclass throws
+     * an exception in this case. If {@code n} is negative, then
+     * this method does nothing and returns {@code 0}.
      *
      * @param      n The number of characters to skip
      * @return     The number of characters actually skipped
--- a/src/java.base/share/classes/java/io/DataInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/DataInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -60,34 +60,34 @@
 
     /**
      * Reads some number of bytes from the contained input stream and
-     * stores them into the buffer array <code>b</code>. The number of
+     * stores them into the buffer array {@code b}. The number of
      * bytes actually read is returned as an integer. This method blocks
      * until input data is available, end of file is detected, or an
      * exception is thrown.
      *
-     * <p>If <code>b</code> is null, a <code>NullPointerException</code> is
-     * thrown. If the length of <code>b</code> is zero, then no bytes are
-     * read and <code>0</code> is returned; otherwise, there is an attempt
+     * <p>If {@code b} is null, a {@code NullPointerException} is
+     * thrown. If the length of {@code b} is zero, then no bytes are
+     * read and {@code 0} is returned; otherwise, there is an attempt
      * to read at least one byte. If no byte is available because the
-     * stream is at end of file, the value <code>-1</code> is returned;
-     * otherwise, at least one byte is read and stored into <code>b</code>.
+     * stream is at end of file, the value {@code -1} is returned;
+     * otherwise, at least one byte is read and stored into {@code b}.
      *
-     * <p>The first byte read is stored into element <code>b[0]</code>, the
-     * next one into <code>b[1]</code>, and so on. The number of bytes read
-     * is, at most, equal to the length of <code>b</code>. Let <code>k</code>
+     * <p>The first byte read is stored into element {@code b[0]}, the
+     * next one into {@code b[1]}, and so on. The number of bytes read
+     * is, at most, equal to the length of {@code b}. Let {@code k}
      * be the number of bytes actually read; these bytes will be stored in
-     * elements <code>b[0]</code> through <code>b[k-1]</code>, leaving
-     * elements <code>b[k]</code> through <code>b[b.length-1]</code>
+     * elements {@code b[0]} through {@code b[k-1]}, leaving
+     * elements {@code b[k]} through {@code b[b.length-1]}
      * unaffected.
      *
-     * <p>The <code>read(b)</code> method has the same effect as:
+     * <p>The {@code read(b)} method has the same effect as:
      * <blockquote><pre>
      * read(b, 0, b.length)
      * </pre></blockquote>
      *
      * @param      b   the buffer into which the data is read.
      * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end
+     *             {@code -1} if there is no more data because the end
      *             of the stream has been reached.
      * @throws     IOException if the first byte cannot be read for any reason
      *             other than end of file, the stream has been closed and the underlying
@@ -101,43 +101,43 @@
     }
 
     /**
-     * Reads up to <code>len</code> bytes of data from the contained
+     * Reads up to {@code len} bytes of data from the contained
      * input stream into an array of bytes.  An attempt is made to read
-     * as many as <code>len</code> bytes, but a smaller number may be read,
+     * as many as {@code len} bytes, but a smaller number may be read,
      * possibly zero. The number of bytes actually read is returned as an
      * integer.
      *
      * <p> This method blocks until input data is available, end of file is
      * detected, or an exception is thrown.
      *
-     * <p> If <code>len</code> is zero, then no bytes are read and
-     * <code>0</code> is returned; otherwise, there is an attempt to read at
+     * <p> If {@code len} is zero, then no bytes are read and
+     * {@code 0} is returned; otherwise, there is an attempt to read at
      * least one byte. If no byte is available because the stream is at end of
-     * file, the value <code>-1</code> is returned; otherwise, at least one
-     * byte is read and stored into <code>b</code>.
+     * file, the value {@code -1} is returned; otherwise, at least one
+     * byte is read and stored into {@code b}.
      *
-     * <p> The first byte read is stored into element <code>b[off]</code>, the
-     * next one into <code>b[off+1]</code>, and so on. The number of bytes read
-     * is, at most, equal to <code>len</code>. Let <i>k</i> be the number of
+     * <p> The first byte read is stored into element {@code b[off]}, the
+     * next one into {@code b[off+1]}, and so on. The number of bytes read
+     * is, at most, equal to {@code len}. Let <i>k</i> be the number of
      * bytes actually read; these bytes will be stored in elements
-     * <code>b[off]</code> through <code>b[off+</code><i>k</i><code>-1]</code>,
-     * leaving elements <code>b[off+</code><i>k</i><code>]</code> through
-     * <code>b[off+len-1]</code> unaffected.
+     * {@code b[off]} through {@code b[off+}<i>k</i>{@code -1]},
+     * leaving elements {@code b[off+}<i>k</i>{@code ]} through
+     * {@code b[off+len-1]} unaffected.
      *
-     * <p> In every case, elements <code>b[0]</code> through
-     * <code>b[off]</code> and elements <code>b[off+len]</code> through
-     * <code>b[b.length-1]</code> are unaffected.
+     * <p> In every case, elements {@code b[0]} through
+     * {@code b[off]} and elements {@code b[off+len]} through
+     * {@code b[b.length-1]} are unaffected.
      *
      * @param      b     the buffer into which the data is read.
-     * @param      off the start offset in the destination array <code>b</code>
+     * @param      off the start offset in the destination array {@code b}
      * @param      len   the maximum number of bytes read.
      * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end
+     *             {@code -1} if there is no more data because the end
      *             of the stream has been reached.
-     * @throws     NullPointerException If <code>b</code> is <code>null</code>.
-     * @throws     IndexOutOfBoundsException If <code>off</code> is negative,
-     *             <code>len</code> is negative, or <code>len</code> is greater than
-     *             <code>b.length - off</code>
+     * @throws     NullPointerException If {@code b} is {@code null}.
+     * @throws     IndexOutOfBoundsException If {@code off} is negative,
+     *             {@code len} is negative, or {@code len} is greater than
+     *             {@code b.length - off}
      * @throws     IOException if the first byte cannot be read for any reason
      *             other than end of file, the stream has been closed and the underlying
      *             input stream does not support reading after close, or another I/O
@@ -205,8 +205,8 @@
     }
 
     /**
-     * See the general contract of the <code>skipBytes</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code skipBytes}
+     * method of {@code DataInput}.
      * <p>
      * Bytes for this operation are read from the contained
      * input stream.
@@ -230,13 +230,13 @@
     }
 
     /**
-     * See the general contract of the <code>readBoolean</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code readBoolean}
+     * method of {@code DataInput}.
      * <p>
      * Bytes for this operation are read from the contained
      * input stream.
      *
-     * @return     the <code>boolean</code> value read.
+     * @return     the {@code boolean} value read.
      * @throws     EOFException  if this input stream has reached the end.
      * @throws     IOException   the stream has been closed and the contained
      *             input stream does not support reading after close, or
@@ -251,15 +251,15 @@
     }
 
     /**
-     * See the general contract of the <code>readByte</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code readByte}
+     * method of {@code DataInput}.
      * <p>
      * Bytes
      * for this operation are read from the contained
      * input stream.
      *
      * @return     the next byte of this input stream as a signed 8-bit
-     *             <code>byte</code>.
+     *             {@code byte}.
      * @throws     EOFException  if this input stream has reached the end.
      * @throws     IOException   the stream has been closed and the contained
      *             input stream does not support reading after close, or
@@ -274,8 +274,8 @@
     }
 
     /**
-     * See the general contract of the <code>readUnsignedByte</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code readUnsignedByte}
+     * method of {@code DataInput}.
      * <p>
      * Bytes
      * for this operation are read from the contained
@@ -297,8 +297,8 @@
     }
 
     /**
-     * See the general contract of the <code>readShort</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code readShort}
+     * method of {@code DataInput}.
      * <p>
      * Bytes
      * for this operation are read from the contained
@@ -322,8 +322,8 @@
     }
 
     /**
-     * See the general contract of the <code>readUnsignedShort</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code readUnsignedShort}
+     * method of {@code DataInput}.
      * <p>
      * Bytes
      * for this operation are read from the contained
@@ -347,15 +347,15 @@
     }
 
     /**
-     * See the general contract of the <code>readChar</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code readChar}
+     * method of {@code DataInput}.
      * <p>
      * Bytes
      * for this operation are read from the contained
      * input stream.
      *
      * @return     the next two bytes of this input stream, interpreted as a
-     *             <code>char</code>.
+     *             {@code char}.
      * @throws     EOFException  if this input stream reaches the end before
      *               reading two bytes.
      * @throws     IOException   the stream has been closed and the contained
@@ -372,15 +372,15 @@
     }
 
     /**
-     * See the general contract of the <code>readInt</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code readInt}
+     * method of {@code DataInput}.
      * <p>
      * Bytes
      * for this operation are read from the contained
      * input stream.
      *
      * @return     the next four bytes of this input stream, interpreted as an
-     *             <code>int</code>.
+     *             {@code int}.
      * @throws     EOFException  if this input stream reaches the end before
      *               reading four bytes.
      * @throws     IOException   the stream has been closed and the contained
@@ -401,15 +401,15 @@
     private byte readBuffer[] = new byte[8];
 
     /**
-     * See the general contract of the <code>readLong</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code readLong}
+     * method of {@code DataInput}.
      * <p>
      * Bytes
      * for this operation are read from the contained
      * input stream.
      *
      * @return     the next eight bytes of this input stream, interpreted as a
-     *             <code>long</code>.
+     *             {@code long}.
      * @throws     EOFException  if this input stream reaches the end before
      *               reading eight bytes.
      * @throws     IOException   the stream has been closed and the contained
@@ -430,15 +430,15 @@
     }
 
     /**
-     * See the general contract of the <code>readFloat</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code readFloat}
+     * method of {@code DataInput}.
      * <p>
      * Bytes
      * for this operation are read from the contained
      * input stream.
      *
      * @return     the next four bytes of this input stream, interpreted as a
-     *             <code>float</code>.
+     *             {@code float}.
      * @throws     EOFException  if this input stream reaches the end before
      *               reading four bytes.
      * @throws     IOException   the stream has been closed and the contained
@@ -452,15 +452,15 @@
     }
 
     /**
-     * See the general contract of the <code>readDouble</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code readDouble}
+     * method of {@code DataInput}.
      * <p>
      * Bytes
      * for this operation are read from the contained
      * input stream.
      *
      * @return     the next eight bytes of this input stream, interpreted as a
-     *             <code>double</code>.
+     *             {@code double}.
      * @throws     EOFException  if this input stream reaches the end before
      *               reading eight bytes.
      * @throws     IOException   the stream has been closed and the contained
@@ -476,8 +476,8 @@
     private char lineBuffer[];
 
     /**
-     * See the general contract of the <code>readLine</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code readLine}
+     * method of {@code DataInput}.
      * <p>
      * Bytes
      * for this operation are read from the contained
@@ -485,9 +485,9 @@
      *
      * @deprecated This method does not properly convert bytes to characters.
      * As of JDK&nbsp;1.1, the preferred way to read lines of text is via the
-     * <code>BufferedReader.readLine()</code> method.  Programs that use the
-     * <code>DataInputStream</code> class to read lines can be converted to use
-     * the <code>BufferedReader</code> class by replacing code of the form:
+     * {@code BufferedReader.readLine()} method.  Programs that use the
+     * {@code DataInputStream} class to read lines can be converted to use
+     * the {@code BufferedReader} class by replacing code of the form:
      * <blockquote><pre>
      *     DataInputStream d =&nbsp;new&nbsp;DataInputStream(in);
      * </pre></blockquote>
@@ -548,8 +548,8 @@
     }
 
     /**
-     * See the general contract of the <code>readUTF</code>
-     * method of <code>DataInput</code>.
+     * See the general contract of the {@code readUTF}
+     * method of {@code DataInput}.
      * <p>
      * Bytes
      * for this operation are read from the contained
@@ -571,13 +571,13 @@
 
     /**
      * Reads from the
-     * stream <code>in</code> a representation
+     * stream {@code in} a representation
      * of a Unicode  character string encoded in
      * <a href="DataInput.html#modified-utf-8">modified UTF-8</a> format;
-     * this string of characters is then returned as a <code>String</code>.
+     * this string of characters is then returned as a {@code String}.
      * The details of the modified UTF-8 representation
-     * are  exactly the same as for the <code>readUTF</code>
-     * method of <code>DataInput</code>.
+     * are  exactly the same as for the {@code readUTF}
+     * method of {@code DataInput}.
      *
      * @param      in   a data input stream.
      * @return     a Unicode string.
--- a/src/java.base/share/classes/java/io/DataOutput.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/DataOutput.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,12 @@
 package java.io;
 
 /**
- * The <code>DataOutput</code> interface provides
+ * The {@code DataOutput} interface provides
  * for converting data from any of the Java
  * primitive types to a series of bytes and
  * writing these bytes to a binary stream.
  * There is  also a facility for converting
- * a <code>String</code> into
+ * a {@code String} into
  * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
  * format and writing the resulting series
  * of bytes.
@@ -39,7 +39,7 @@
  * For all the methods in this interface that
  * write bytes, it is generally true that if
  * a byte cannot be written for any reason,
- * an <code>IOException</code> is thrown.
+ * an {@code IOException} is thrown.
  *
  * @author  Frank Yellin
  * @see     java.io.DataInput
@@ -50,8 +50,8 @@
 interface DataOutput {
     /**
      * Writes to the output stream the eight
-     * low-order bits of the argument <code>b</code>.
-     * The 24 high-order  bits of <code>b</code>
+     * low-order bits of the argument {@code b}.
+     * The 24 high-order  bits of {@code b}
      * are ignored.
      *
      * @param      b   the byte to be written.
@@ -60,14 +60,14 @@
     void write(int b) throws IOException;
 
     /**
-     * Writes to the output stream all the bytes in array <code>b</code>.
-     * If <code>b</code> is <code>null</code>,
-     * a <code>NullPointerException</code> is thrown.
-     * If <code>b.length</code> is zero, then
+     * Writes to the output stream all the bytes in array {@code b}.
+     * If {@code b} is {@code null},
+     * a {@code NullPointerException} is thrown.
+     * If {@code b.length} is zero, then
      * no bytes are written. Otherwise, the byte
-     * <code>b[0]</code> is written first, then
-     * <code>b[1]</code>, and so on; the last byte
-     * written is <code>b[b.length-1]</code>.
+     * {@code b[0]} is written first, then
+     * {@code b[1]}, and so on; the last byte
+     * written is {@code b[b.length-1]}.
      *
      * @param      b   the data.
      * @throws     IOException  if an I/O error occurs.
@@ -75,19 +75,19 @@
     void write(byte b[]) throws IOException;
 
     /**
-     * Writes <code>len</code> bytes from array
-     * <code>b</code>, in order,  to
-     * the output stream.  If <code>b</code>
-     * is <code>null</code>, a <code>NullPointerException</code>
-     * is thrown.  If <code>off</code> is negative,
-     * or <code>len</code> is negative, or <code>off+len</code>
+     * Writes {@code len} bytes from array
+     * {@code b}, in order,  to
+     * the output stream.  If {@code b}
+     * is {@code null}, a {@code NullPointerException}
+     * is thrown.  If {@code off} is negative,
+     * or {@code len} is negative, or {@code off+len}
      * is greater than the length of the array
-     * <code>b</code>, then an <code>IndexOutOfBoundsException</code>
-     * is thrown.  If <code>len</code> is zero,
+     * {@code b}, then an {@code IndexOutOfBoundsException}
+     * is thrown.  If {@code len} is zero,
      * then no bytes are written. Otherwise, the
-     * byte <code>b[off]</code> is written first,
-     * then <code>b[off+1]</code>, and so on; the
-     * last byte written is <code>b[off+len-1]</code>.
+     * byte {@code b[off]} is written first,
+     * then {@code b[off+1]}, and so on; the
+     * last byte written is {@code b[off+len-1]}.
      *
      * @param      b     the data.
      * @param      off   the start offset in the data.
@@ -97,16 +97,16 @@
     void write(byte b[], int off, int len) throws IOException;
 
     /**
-     * Writes a <code>boolean</code> value to this output stream.
-     * If the argument <code>v</code>
-     * is <code>true</code>, the value <code>(byte)1</code>
-     * is written; if <code>v</code> is <code>false</code>,
-     * the  value <code>(byte)0</code> is written.
+     * Writes a {@code boolean} value to this output stream.
+     * If the argument {@code v}
+     * is {@code true}, the value {@code (byte)1}
+     * is written; if {@code v} is {@code false},
+     * the  value {@code (byte)0} is written.
      * The byte written by this method may
-     * be read by the <code>readBoolean</code>
-     * method of interface <code>DataInput</code>,
-     * which will then return a <code>boolean</code>
-     * equal to <code>v</code>.
+     * be read by the {@code readBoolean}
+     * method of interface {@code DataInput},
+     * which will then return a {@code boolean}
+     * equal to {@code v}.
      *
      * @param      v   the boolean to be written.
      * @throws     IOException  if an I/O error occurs.
@@ -115,15 +115,15 @@
 
     /**
      * Writes to the output stream the eight low-
-     * order bits of the argument <code>v</code>.
-     * The 24 high-order bits of <code>v</code>
-     * are ignored. (This means  that <code>writeByte</code>
-     * does exactly the same thing as <code>write</code>
+     * order bits of the argument {@code v}.
+     * The 24 high-order bits of {@code v}
+     * are ignored. (This means  that {@code writeByte}
+     * does exactly the same thing as {@code write}
      * for an integer argument.) The byte written
-     * by this method may be read by the <code>readByte</code>
-     * method of interface <code>DataInput</code>,
-     * which will then return a <code>byte</code>
-     * equal to <code>(byte)v</code>.
+     * by this method may be read by the {@code readByte}
+     * method of interface {@code DataInput},
+     * which will then return a {@code byte}
+     * equal to {@code (byte)v}.
      *
      * @param      v   the byte value to be written.
      * @throws     IOException  if an I/O error occurs.
@@ -140,18 +140,18 @@
      * (byte)(0xff & v)
      * }</pre> <p>
      * The bytes written by this method may be
-     * read by the <code>readShort</code> method
-     * of interface <code>DataInput</code> , which
-     * will then return a <code>short</code> equal
-     * to <code>(short)v</code>.
+     * read by the {@code readShort} method
+     * of interface {@code DataInput} , which
+     * will then return a {@code short} equal
+     * to {@code (short)v}.
      *
-     * @param      v   the <code>short</code> value to be written.
+     * @param      v   the {@code short} value to be written.
      * @throws     IOException  if an I/O error occurs.
      */
     void writeShort(int v) throws IOException;
 
     /**
-     * Writes a <code>char</code> value, which
+     * Writes a {@code char} value, which
      * is comprised of two bytes, to the
      * output stream.
      * The byte values to be written, in the  order
@@ -161,18 +161,18 @@
      * (byte)(0xff & v)
      * }</pre><p>
      * The bytes written by this method may be
-     * read by the <code>readChar</code> method
-     * of interface <code>DataInput</code> , which
-     * will then return a <code>char</code> equal
-     * to <code>(char)v</code>.
+     * read by the {@code readChar} method
+     * of interface {@code DataInput} , which
+     * will then return a {@code char} equal
+     * to {@code (char)v}.
      *
-     * @param      v   the <code>char</code> value to be written.
+     * @param      v   the {@code char} value to be written.
      * @throws     IOException  if an I/O error occurs.
      */
     void writeChar(int v) throws IOException;
 
     /**
-     * Writes an <code>int</code> value, which is
+     * Writes an {@code int} value, which is
      * comprised of four bytes, to the output stream.
      * The byte values to be written, in the  order
      * shown, are:
@@ -183,17 +183,17 @@
      * (byte)(0xff & v)
      * }</pre><p>
      * The bytes written by this method may be read
-     * by the <code>readInt</code> method of interface
-     * <code>DataInput</code> , which will then
-     * return an <code>int</code> equal to <code>v</code>.
+     * by the {@code readInt} method of interface
+     * {@code DataInput} , which will then
+     * return an {@code int} equal to {@code v}.
      *
-     * @param      v   the <code>int</code> value to be written.
+     * @param      v   the {@code int} value to be written.
      * @throws     IOException  if an I/O error occurs.
      */
     void writeInt(int v) throws IOException;
 
     /**
-     * Writes a <code>long</code> value, which is
+     * Writes a {@code long} value, which is
      * comprised of eight bytes, to the output stream.
      * The byte values to be written, in the  order
      * shown, are:
@@ -208,50 +208,50 @@
      * (byte)(0xff & v)
      * }</pre><p>
      * The bytes written by this method may be
-     * read by the <code>readLong</code> method
-     * of interface <code>DataInput</code> , which
-     * will then return a <code>long</code> equal
-     * to <code>v</code>.
+     * read by the {@code readLong} method
+     * of interface {@code DataInput} , which
+     * will then return a {@code long} equal
+     * to {@code v}.
      *
-     * @param      v   the <code>long</code> value to be written.
+     * @param      v   the {@code long} value to be written.
      * @throws     IOException  if an I/O error occurs.
      */
     void writeLong(long v) throws IOException;
 
     /**
-     * Writes a <code>float</code> value,
+     * Writes a {@code float} value,
      * which is comprised of four bytes, to the output stream.
      * It does this as if it first converts this
-     * <code>float</code> value to an <code>int</code>
-     * in exactly the manner of the <code>Float.floatToIntBits</code>
-     * method  and then writes the <code>int</code>
-     * value in exactly the manner of the  <code>writeInt</code>
+     * {@code float} value to an {@code int}
+     * in exactly the manner of the {@code Float.floatToIntBits}
+     * method  and then writes the {@code int}
+     * value in exactly the manner of the  {@code writeInt}
      * method.  The bytes written by this method
-     * may be read by the <code>readFloat</code>
-     * method of interface <code>DataInput</code>,
-     * which will then return a <code>float</code>
-     * equal to <code>v</code>.
+     * may be read by the {@code readFloat}
+     * method of interface {@code DataInput},
+     * which will then return a {@code float}
+     * equal to {@code v}.
      *
-     * @param      v   the <code>float</code> value to be written.
+     * @param      v   the {@code float} value to be written.
      * @throws     IOException  if an I/O error occurs.
      */
     void writeFloat(float v) throws IOException;
 
     /**
-     * Writes a <code>double</code> value,
+     * Writes a {@code double} value,
      * which is comprised of eight bytes, to the output stream.
      * It does this as if it first converts this
-     * <code>double</code> value to a <code>long</code>
-     * in exactly the manner of the <code>Double.doubleToLongBits</code>
-     * method  and then writes the <code>long</code>
-     * value in exactly the manner of the  <code>writeLong</code>
+     * {@code double} value to a {@code long}
+     * in exactly the manner of the {@code Double.doubleToLongBits}
+     * method  and then writes the {@code long}
+     * value in exactly the manner of the  {@code writeLong}
      * method. The bytes written by this method
-     * may be read by the <code>readDouble</code>
-     * method of interface <code>DataInput</code>,
-     * which will then return a <code>double</code>
-     * equal to <code>v</code>.
+     * may be read by the {@code readDouble}
+     * method of interface {@code DataInput},
+     * which will then return a {@code double}
+     * equal to {@code v}.
      *
-     * @param      v   the <code>double</code> value to be written.
+     * @param      v   the {@code double} value to be written.
      * @throws     IOException  if an I/O error occurs.
      */
     void writeDouble(double v) throws IOException;
@@ -259,17 +259,17 @@
     /**
      * Writes a string to the output stream.
      * For every character in the string
-     * <code>s</code>,  taken in order, one byte
+     * {@code s},  taken in order, one byte
      * is written to the output stream.  If
-     * <code>s</code> is <code>null</code>, a <code>NullPointerException</code>
-     * is thrown.<p>  If <code>s.length</code>
+     * {@code s} is {@code null}, a {@code NullPointerException}
+     * is thrown.<p>  If {@code s.length}
      * is zero, then no bytes are written. Otherwise,
-     * the character <code>s[0]</code> is written
-     * first, then <code>s[1]</code>, and so on;
-     * the last character written is <code>s[s.length-1]</code>.
+     * the character {@code s[0]} is written
+     * first, then {@code s[1]}, and so on;
+     * the last character written is {@code s[s.length-1]}.
      * For each character, one byte is written,
      * the low-order byte, in exactly the manner
-     * of the <code>writeByte</code> method . The
+     * of the {@code writeByte} method . The
      * high-order eight bits of each character
      * in the string are ignored.
      *
@@ -279,19 +279,19 @@
     void writeBytes(String s) throws IOException;
 
     /**
-     * Writes every character in the string <code>s</code>,
+     * Writes every character in the string {@code s},
      * to the output stream, in order,
-     * two bytes per character. If <code>s</code>
-     * is <code>null</code>, a <code>NullPointerException</code>
-     * is thrown.  If <code>s.length</code>
+     * two bytes per character. If {@code s}
+     * is {@code null}, a {@code NullPointerException}
+     * is thrown.  If {@code s.length}
      * is zero, then no characters are written.
-     * Otherwise, the character <code>s[0]</code>
-     * is written first, then <code>s[1]</code>,
+     * Otherwise, the character {@code s[0]}
+     * is written first, then {@code s[1]},
      * and so on; the last character written is
-     * <code>s[s.length-1]</code>. For each character,
+     * {@code s[s.length-1]}. For each character,
      * two bytes are actually written, high-order
      * byte first, in exactly the manner of the
-     * <code>writeChar</code> method.
+     * {@code writeChar} method.
      *
      * @param      s   the string value to be written.
      * @throws     IOException  if an I/O error occurs.
@@ -304,19 +304,19 @@
      * by the
      * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
      * representation
-     * of  every character in the string <code>s</code>.
-     * If <code>s</code> is <code>null</code>,
-     * a <code>NullPointerException</code> is thrown.
-     * Each character in the string <code>s</code>
+     * of  every character in the string {@code s}.
+     * If {@code s} is {@code null},
+     * a {@code NullPointerException} is thrown.
+     * Each character in the string {@code s}
      * is converted to a group of one, two, or
      * three bytes, depending on the value of the
      * character.<p>
-     * If a character <code>c</code>
+     * If a character {@code c}
      * is in the range <code>&#92;u0001</code> through
      * <code>&#92;u007f</code>, it is represented
      * by one byte:
      * <pre>(byte)c </pre>  <p>
-     * If a character <code>c</code> is <code>&#92;u0000</code>
+     * If a character {@code c} is <code>&#92;u0000</code>
      * or is in the range <code>&#92;u0080</code>
      * through <code>&#92;u07ff</code>, then it is
      * represented by two bytes, to be written
@@ -324,8 +324,8 @@
      * (byte)(0xc0 | (0x1f & (c >> 6)))
      * (byte)(0x80 | (0x3f & c))
      * }</pre> <p> If a character
-     * <code>c</code> is in the range <code>&#92;u0800</code>
-     * through <code>uffff</code>, then it is
+     * {@code c} is in the range <code>&#92;u0800</code>
+     * through {@code uffff}, then it is
      * represented by three bytes, to be written
      * in the order shown: <pre>{@code
      * (byte)(0xe0 | (0x0f & (c >> 12)))
@@ -333,19 +333,19 @@
      * (byte)(0x80 | (0x3f & c))
      * }</pre>  <p> First,
      * the total number of bytes needed to represent
-     * all the characters of <code>s</code> is
+     * all the characters of {@code s} is
      * calculated. If this number is larger than
-     * <code>65535</code>, then a <code>UTFDataFormatException</code>
+     * {@code 65535}, then a {@code UTFDataFormatException}
      * is thrown. Otherwise, this length is written
      * to the output stream in exactly the manner
-     * of the <code>writeShort</code> method;
+     * of the {@code writeShort} method;
      * after this, the one-, two-, or three-byte
      * representation of each character in the
-     * string <code>s</code> is written.<p>  The
+     * string {@code s} is written.<p>  The
      * bytes written by this method may be read
-     * by the <code>readUTF</code> method of interface
-     * <code>DataInput</code> , which will then
-     * return a <code>String</code> equal to <code>s</code>.
+     * by the {@code readUTF} method of interface
+     * {@code DataInput} , which will then
+     * return a {@code String} equal to {@code s}.
      *
      * @param      s   the string value to be written.
      * @throws     IOException  if an I/O error occurs.
--- a/src/java.base/share/classes/java/io/DataOutputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/DataOutputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -49,7 +49,7 @@
 
     /**
      * Creates a new data output stream to write data to the specified
-     * underlying output stream. The counter <code>written</code> is
+     * underlying output stream. The counter {@code written} is
      * set to zero.
      *
      * @param   out   the underlying output stream, to be saved for later
@@ -74,13 +74,13 @@
 
     /**
      * Writes the specified byte (the low eight bits of the argument
-     * <code>b</code>) to the underlying output stream. If no exception
-     * is thrown, the counter <code>written</code> is incremented by
-     * <code>1</code>.
+     * {@code b}) to the underlying output stream. If no exception
+     * is thrown, the counter {@code written} is incremented by
+     * {@code 1}.
      * <p>
-     * Implements the <code>write</code> method of <code>OutputStream</code>.
+     * Implements the {@code write} method of {@code OutputStream}.
      *
-     * @param      b   the <code>byte</code> to be written.
+     * @param      b   the {@code byte} to be written.
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterOutputStream#out
      */
@@ -90,10 +90,10 @@
     }
 
     /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to the underlying output stream.
-     * If no exception is thrown, the counter <code>written</code> is
-     * incremented by <code>len</code>.
+     * Writes {@code len} bytes from the specified byte array
+     * starting at offset {@code off} to the underlying output stream.
+     * If no exception is thrown, the counter {@code written} is
+     * incremented by {@code len}.
      *
      * @param      b     the data.
      * @param      off   the start offset in the data.
@@ -112,8 +112,8 @@
      * Flushes this data output stream. This forces any buffered output
      * bytes to be written out to the stream.
      * <p>
-     * The <code>flush</code> method of <code>DataOutputStream</code>
-     * calls the <code>flush</code> method of its underlying output stream.
+     * The {@code flush} method of {@code DataOutputStream}
+     * calls the {@code flush} method of its underlying output stream.
      *
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterOutputStream#out
@@ -124,14 +124,14 @@
     }
 
     /**
-     * Writes a <code>boolean</code> to the underlying output stream as
-     * a 1-byte value. The value <code>true</code> is written out as the
-     * value <code>(byte)1</code>; the value <code>false</code> is
-     * written out as the value <code>(byte)0</code>. If no exception is
-     * thrown, the counter <code>written</code> is incremented by
-     * <code>1</code>.
+     * Writes a {@code boolean} to the underlying output stream as
+     * a 1-byte value. The value {@code true} is written out as the
+     * value {@code (byte)1}; the value {@code false} is
+     * written out as the value {@code (byte)0}. If no exception is
+     * thrown, the counter {@code written} is incremented by
+     * {@code 1}.
      *
-     * @param      v   a <code>boolean</code> value to be written.
+     * @param      v   a {@code boolean} value to be written.
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterOutputStream#out
      */
@@ -141,11 +141,11 @@
     }
 
     /**
-     * Writes out a <code>byte</code> to the underlying output stream as
+     * Writes out a {@code byte} to the underlying output stream as
      * a 1-byte value. If no exception is thrown, the counter
-     * <code>written</code> is incremented by <code>1</code>.
+     * {@code written} is incremented by {@code 1}.
      *
-     * @param      v   a <code>byte</code> value to be written.
+     * @param      v   a {@code byte} value to be written.
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterOutputStream#out
      */
@@ -155,11 +155,11 @@
     }
 
     /**
-     * Writes a <code>short</code> to the underlying output stream as two
+     * Writes a {@code short} to the underlying output stream as two
      * bytes, high byte first. If no exception is thrown, the counter
-     * <code>written</code> is incremented by <code>2</code>.
+     * {@code written} is incremented by {@code 2}.
      *
-     * @param      v   a <code>short</code> to be written.
+     * @param      v   a {@code short} to be written.
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterOutputStream#out
      */
@@ -170,11 +170,11 @@
     }
 
     /**
-     * Writes a <code>char</code> to the underlying output stream as a
+     * Writes a {@code char} to the underlying output stream as a
      * 2-byte value, high byte first. If no exception is thrown, the
-     * counter <code>written</code> is incremented by <code>2</code>.
+     * counter {@code written} is incremented by {@code 2}.
      *
-     * @param      v   a <code>char</code> value to be written.
+     * @param      v   a {@code char} value to be written.
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterOutputStream#out
      */
@@ -185,11 +185,11 @@
     }
 
     /**
-     * Writes an <code>int</code> to the underlying output stream as four
+     * Writes an {@code int} to the underlying output stream as four
      * bytes, high byte first. If no exception is thrown, the counter
-     * <code>written</code> is incremented by <code>4</code>.
+     * {@code written} is incremented by {@code 4}.
      *
-     * @param      v   an <code>int</code> to be written.
+     * @param      v   an {@code int} to be written.
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterOutputStream#out
      */
@@ -204,11 +204,11 @@
     private byte writeBuffer[] = new byte[8];
 
     /**
-     * Writes a <code>long</code> to the underlying output stream as eight
+     * Writes a {@code long} to the underlying output stream as eight
      * bytes, high byte first. In no exception is thrown, the counter
-     * <code>written</code> is incremented by <code>8</code>.
+     * {@code written} is incremented by {@code 8}.
      *
-     * @param      v   a <code>long</code> to be written.
+     * @param      v   a {@code long} to be written.
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterOutputStream#out
      */
@@ -226,14 +226,14 @@
     }
 
     /**
-     * Converts the float argument to an <code>int</code> using the
-     * <code>floatToIntBits</code> method in class <code>Float</code>,
-     * and then writes that <code>int</code> value to the underlying
+     * Converts the float argument to an {@code int} using the
+     * {@code floatToIntBits} method in class {@code Float},
+     * and then writes that {@code int} value to the underlying
      * output stream as a 4-byte quantity, high byte first. If no
-     * exception is thrown, the counter <code>written</code> is
-     * incremented by <code>4</code>.
+     * exception is thrown, the counter {@code written} is
+     * incremented by {@code 4}.
      *
-     * @param      v   a <code>float</code> value to be written.
+     * @param      v   a {@code float} value to be written.
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterOutputStream#out
      * @see        java.lang.Float#floatToIntBits(float)
@@ -243,14 +243,14 @@
     }
 
     /**
-     * Converts the double argument to a <code>long</code> using the
-     * <code>doubleToLongBits</code> method in class <code>Double</code>,
-     * and then writes that <code>long</code> value to the underlying
+     * Converts the double argument to a {@code long} using the
+     * {@code doubleToLongBits} method in class {@code Double},
+     * and then writes that {@code long} value to the underlying
      * output stream as an 8-byte quantity, high byte first. If no
-     * exception is thrown, the counter <code>written</code> is
-     * incremented by <code>8</code>.
+     * exception is thrown, the counter {@code written} is
+     * incremented by {@code 8}.
      *
-     * @param      v   a <code>double</code> value to be written.
+     * @param      v   a {@code double} value to be written.
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterOutputStream#out
      * @see        java.lang.Double#doubleToLongBits(double)
@@ -263,8 +263,8 @@
      * Writes out the string to the underlying output stream as a
      * sequence of bytes. Each character in the string is written out, in
      * sequence, by discarding its high eight bits. If no exception is
-     * thrown, the counter <code>written</code> is incremented by the
-     * length of <code>s</code>.
+     * thrown, the counter {@code written} is incremented by the
+     * length of {@code s}.
      *
      * @param      s   a string of bytes to be written.
      * @throws     IOException  if an I/O error occurs.
@@ -281,11 +281,11 @@
     /**
      * Writes a string to the underlying output stream as a sequence of
      * characters. Each character is written to the data output stream as
-     * if by the <code>writeChar</code> method. If no exception is
-     * thrown, the counter <code>written</code> is incremented by twice
-     * the length of <code>s</code>.
+     * if by the {@code writeChar} method. If no exception is
+     * thrown, the counter {@code written} is incremented by twice
+     * the length of {@code s}.
      *
-     * @param      s   a <code>String</code> value to be written.
+     * @param      s   a {@code String} value to be written.
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.DataOutputStream#writeChar(int)
      * @see        java.io.FilterOutputStream#out
@@ -306,15 +306,15 @@
      * encoding in a machine-independent manner.
      * <p>
      * First, two bytes are written to the output stream as if by the
-     * <code>writeShort</code> method giving the number of bytes to
+     * {@code writeShort} method giving the number of bytes to
      * follow. This value is the number of bytes actually written out,
      * not the length of the string. Following the length, each character
      * of the string is output, in sequence, using the modified UTF-8 encoding
      * for the character. If no exception is thrown, the counter
-     * <code>written</code> is incremented by the total number of
+     * {@code written} is incremented by the total number of
      * bytes written to the output stream. This will be at least two
-     * plus the length of <code>str</code>, and at most two plus
-     * thrice the length of <code>str</code>.
+     * plus the length of {@code str}, and at most two plus
+     * thrice the length of {@code str}.
      *
      * @param      str   a string to be written.
      * @throws     UTFDataFormatException  if the modified UTF-8 encoding of
@@ -331,15 +331,15 @@
      * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
      * encoding in a machine-independent manner.
      * <p>
-     * First, two bytes are written to out as if by the <code>writeShort</code>
+     * First, two bytes are written to out as if by the {@code writeShort}
      * method giving the number of bytes to follow. This value is the number of
      * bytes actually written out, not the length of the string. Following the
      * length, each character of the string is output, in sequence, using the
      * modified UTF-8 encoding for the character. If no exception is thrown, the
-     * counter <code>written</code> is incremented by the total number of
+     * counter {@code written} is incremented by the total number of
      * bytes written to the output stream. This will be at least two
-     * plus the length of <code>str</code>, and at most two plus
-     * thrice the length of <code>str</code>.
+     * plus the length of {@code str}, and at most two plus
+     * thrice the length of {@code str}.
      *
      * @param      str   a string to be written.
      * @param      out   destination to write to
@@ -410,11 +410,11 @@
     }
 
     /**
-     * Returns the current value of the counter <code>written</code>,
+     * Returns the current value of the counter {@code written},
      * the number of bytes written to this data output stream so far.
      * If the counter overflows, it will be wrapped to Integer.MAX_VALUE.
      *
-     * @return  the value of the <code>written</code> field.
+     * @return  the value of the {@code written} field.
      * @see     java.io.DataOutputStream#written
      */
     public final int size() {
--- a/src/java.base/share/classes/java/io/EOFException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/EOFException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -44,7 +44,7 @@
     private static final long serialVersionUID = 6433858223774886977L;
 
     /**
-     * Constructs an <code>EOFException</code> with <code>null</code>
+     * Constructs an {@code EOFException} with {@code null}
      * as its error detail message.
      */
     public EOFException() {
@@ -52,10 +52,10 @@
     }
 
     /**
-     * Constructs an <code>EOFException</code> with the specified detail
-     * message. The string <code>s</code> may later be retrieved by the
+     * Constructs an {@code EOFException} with the specified detail
+     * message. The string {@code s} may later be retrieved by the
      * <code>{@link java.lang.Throwable#getMessage}</code> method of class
-     * <code>java.lang.Throwable</code>.
+     * {@code java.lang.Throwable}.
      *
      * @param   s   the detail message.
      */
--- a/src/java.base/share/classes/java/io/File.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/File.java	Tue Sep 24 09:43:43 2019 +0100
@@ -46,8 +46,8 @@
  *
  * <ol>
  * <li> An optional system-dependent <em>prefix</em> string,
- *      such as a disk-drive specifier, <code>"/"</code>&nbsp;for the UNIX root
- *      directory, or <code>"\\\\"</code>&nbsp;for a Microsoft Windows UNC pathname, and
+ *      such as a disk-drive specifier, {@code "/"}&nbsp;for the UNIX root
+ *      directory, or {@code "\\\\"}&nbsp;for a Microsoft Windows UNC pathname, and
  * <li> A sequence of zero or more string <em>names</em>.
  * </ol>
  *
@@ -61,7 +61,7 @@
  * inherently system-dependent.  When an abstract pathname is converted into a
  * pathname string, each name is separated from the next by a single copy of
  * the default <em>separator character</em>.  The default name-separator
- * character is defined by the system property <code>file.separator</code>, and
+ * character is defined by the system property {@code file.separator}, and
  * is made available in the public static fields {@link
  * #separator} and {@link #separatorChar} of this class.
  * When a pathname string is converted into an abstract pathname, the names
@@ -73,9 +73,9 @@
  * that no other information is required in order to locate the file that it
  * denotes.  A relative pathname, in contrast, must be interpreted in terms of
  * information taken from some other pathname.  By default the classes in the
- * <code>java.io</code> package always resolve relative pathnames against the
+ * {@code java.io} package always resolve relative pathnames against the
  * current user directory.  This directory is named by the system property
- * <code>user.dir</code>, and is typically the directory in which the Java
+ * {@code user.dir}, and is typically the directory in which the Java
  * virtual machine was invoked.
  *
  * <p> The <em>parent</em> of an abstract pathname may be obtained by invoking
@@ -94,14 +94,14 @@
  * <ul>
  *
  * <li> For UNIX platforms, the prefix of an absolute pathname is always
- * <code>"/"</code>.  Relative pathnames have no prefix.  The abstract pathname
- * denoting the root directory has the prefix <code>"/"</code> and an empty
+ * {@code "/"}.  Relative pathnames have no prefix.  The abstract pathname
+ * denoting the root directory has the prefix {@code "/"} and an empty
  * name sequence.
  *
  * <li> For Microsoft Windows platforms, the prefix of a pathname that contains a drive
- * specifier consists of the drive letter followed by <code>":"</code> and
- * possibly followed by <code>"\\"</code> if the pathname is absolute.  The
- * prefix of a UNC pathname is <code>"\\\\"</code>; the hostname and the share
+ * specifier consists of the drive letter followed by {@code ":"} and
+ * possibly followed by {@code "\\"} if the pathname is absolute.  The
+ * prefix of a UNC pathname is {@code "\\\\"}; the hostname and the share
  * name are the first two names in the name sequence.  A relative pathname that
  * does not specify a drive has no prefix.
  *
@@ -124,8 +124,8 @@
  * may apply to all other users.  The access permissions on an object may
  * cause some methods in this class to fail.
  *
- * <p> Instances of the <code>File</code> class are immutable; that is, once
- * created, the abstract pathname represented by a <code>File</code> object
+ * <p> Instances of the {@code File} class are immutable; that is, once
+ * created, the abstract pathname represented by a {@code File} object
  * will never change.
  *
  * <h2>Interoperability with {@code java.nio.file} package</h2>
@@ -208,8 +208,8 @@
     /**
      * The system-dependent default name-separator character.  This field is
      * initialized to contain the first character of the value of the system
-     * property <code>file.separator</code>.  On UNIX systems the value of this
-     * field is <code>'/'</code>; on Microsoft Windows systems it is <code>'\\'</code>.
+     * property {@code file.separator}.  On UNIX systems the value of this
+     * field is {@code '/'}; on Microsoft Windows systems it is {@code '\\'}.
      *
      * @see     java.lang.System#getProperty(java.lang.String)
      */
@@ -225,10 +225,10 @@
     /**
      * The system-dependent path-separator character.  This field is
      * initialized to contain the first character of the value of the system
-     * property <code>path.separator</code>.  This character is used to
+     * property {@code path.separator}.  This character is used to
      * separate filenames in a sequence of files given as a <em>path list</em>.
-     * On UNIX systems, this character is <code>':'</code>; on Microsoft Windows systems it
-     * is <code>';'</code>.
+     * On UNIX systems, this character is {@code ':'}; on Microsoft Windows systems it
+     * is {@code ';'}.
      *
      * @see     java.lang.System#getProperty(java.lang.String)
      */
@@ -265,13 +265,13 @@
     }
 
     /**
-     * Creates a new <code>File</code> instance by converting the given
+     * Creates a new {@code File} instance by converting the given
      * pathname string into an abstract pathname.  If the given string is
      * the empty string, then the result is the empty abstract pathname.
      *
      * @param   pathname  A pathname string
      * @throws  NullPointerException
-     *          If the <code>pathname</code> argument is <code>null</code>
+     *          If the {@code pathname} argument is {@code null}
      */
     public File(String pathname) {
         if (pathname == null) {
@@ -289,21 +289,21 @@
        compatibility with the original behavior of this class. */
 
     /**
-     * Creates a new <code>File</code> instance from a parent pathname string
+     * Creates a new {@code File} instance from a parent pathname string
      * and a child pathname string.
      *
-     * <p> If <code>parent</code> is <code>null</code> then the new
-     * <code>File</code> instance is created as if by invoking the
-     * single-argument <code>File</code> constructor on the given
-     * <code>child</code> pathname string.
+     * <p> If {@code parent} is {@code null} then the new
+     * {@code File} instance is created as if by invoking the
+     * single-argument {@code File} constructor on the given
+     * {@code child} pathname string.
      *
-     * <p> Otherwise the <code>parent</code> pathname string is taken to denote
-     * a directory, and the <code>child</code> pathname string is taken to
-     * denote either a directory or a file.  If the <code>child</code> pathname
+     * <p> Otherwise the {@code parent} pathname string is taken to denote
+     * a directory, and the {@code child} pathname string is taken to
+     * denote either a directory or a file.  If the {@code child} pathname
      * string is absolute then it is converted into a relative pathname in a
-     * system-dependent way.  If <code>parent</code> is the empty string then
-     * the new <code>File</code> instance is created by converting
-     * <code>child</code> into an abstract pathname and resolving the result
+     * system-dependent way.  If {@code parent} is the empty string then
+     * the new {@code File} instance is created by converting
+     * {@code child} into an abstract pathname and resolving the result
      * against a system-dependent default directory.  Otherwise each pathname
      * string is converted into an abstract pathname and the child abstract
      * pathname is resolved against the parent.
@@ -311,7 +311,7 @@
      * @param   parent  The parent pathname string
      * @param   child   The child pathname string
      * @throws  NullPointerException
-     *          If <code>child</code> is <code>null</code>
+     *          If {@code child} is {@code null}
      */
     public File(String parent, String child) {
         if (child == null) {
@@ -332,21 +332,21 @@
     }
 
     /**
-     * Creates a new <code>File</code> instance from a parent abstract
+     * Creates a new {@code File} instance from a parent abstract
      * pathname and a child pathname string.
      *
-     * <p> If <code>parent</code> is <code>null</code> then the new
-     * <code>File</code> instance is created as if by invoking the
-     * single-argument <code>File</code> constructor on the given
-     * <code>child</code> pathname string.
+     * <p> If {@code parent} is {@code null} then the new
+     * {@code File} instance is created as if by invoking the
+     * single-argument {@code File} constructor on the given
+     * {@code child} pathname string.
      *
-     * <p> Otherwise the <code>parent</code> abstract pathname is taken to
-     * denote a directory, and the <code>child</code> pathname string is taken
-     * to denote either a directory or a file.  If the <code>child</code>
+     * <p> Otherwise the {@code parent} abstract pathname is taken to
+     * denote a directory, and the {@code child} pathname string is taken
+     * to denote either a directory or a file.  If the {@code child}
      * pathname string is absolute then it is converted into a relative
-     * pathname in a system-dependent way.  If <code>parent</code> is the empty
-     * abstract pathname then the new <code>File</code> instance is created by
-     * converting <code>child</code> into an abstract pathname and resolving
+     * pathname in a system-dependent way.  If {@code parent} is the empty
+     * abstract pathname then the new {@code File} instance is created by
+     * converting {@code child} into an abstract pathname and resolving
      * the result against a system-dependent default directory.  Otherwise each
      * pathname string is converted into an abstract pathname and the child
      * abstract pathname is resolved against the parent.
@@ -354,7 +354,7 @@
      * @param   parent  The parent abstract pathname
      * @param   child   The child pathname string
      * @throws  NullPointerException
-     *          If <code>child</code> is <code>null</code>
+     *          If {@code child} is {@code null}
      */
     public File(File parent, String child) {
         if (child == null) {
@@ -460,7 +460,7 @@
 
     /**
      * Returns the pathname string of this abstract pathname's parent, or
-     * <code>null</code> if this pathname does not name a parent directory.
+     * {@code null} if this pathname does not name a parent directory.
      *
      * <p> The <em>parent</em> of an abstract pathname consists of the
      * pathname's prefix, if any, and each name in the pathname's name
@@ -468,7 +468,7 @@
      * the pathname does not name a parent directory.
      *
      * @return  The pathname string of the parent directory named by this
-     *          abstract pathname, or <code>null</code> if this pathname
+     *          abstract pathname, or {@code null} if this pathname
      *          does not name a parent
      */
     public String getParent() {
@@ -483,7 +483,7 @@
 
     /**
      * Returns the abstract pathname of this abstract pathname's parent,
-     * or <code>null</code> if this pathname does not name a parent
+     * or {@code null} if this pathname does not name a parent
      * directory.
      *
      * <p> The <em>parent</em> of an abstract pathname consists of the
@@ -492,7 +492,7 @@
      * the pathname does not name a parent directory.
      *
      * @return  The abstract pathname of the parent directory named by this
-     *          abstract pathname, or <code>null</code> if this pathname
+     *          abstract pathname, or {@code null} if this pathname
      *          does not name a parent
      *
      * @since 1.2
@@ -520,12 +520,12 @@
     /**
      * Tests whether this abstract pathname is absolute.  The definition of
      * absolute pathname is system dependent.  On UNIX systems, a pathname is
-     * absolute if its prefix is <code>"/"</code>.  On Microsoft Windows systems, a
+     * absolute if its prefix is {@code "/"}.  On Microsoft Windows systems, a
      * pathname is absolute if its prefix is a drive specifier followed by
-     * <code>"\\"</code>, or if its prefix is <code>"\\\\"</code>.
+     * {@code "\\"}, or if its prefix is {@code "\\\\"}.
      *
-     * @return  <code>true</code> if this abstract pathname is absolute,
-     *          <code>false</code> otherwise
+     * @return  {@code true} if this abstract pathname is absolute,
+     *          {@code false} otherwise
      */
     public boolean isAbsolute() {
         return fs.isAbsolute(this);
@@ -538,7 +538,7 @@
      * string is simply returned as if by the {@link #getPath}
      * method.  If this abstract pathname is the empty abstract pathname then
      * the pathname string of the current user directory, which is named by the
-     * system property <code>user.dir</code>, is returned.  Otherwise this
+     * system property {@code user.dir}, is returned.  Otherwise this
      * pathname is resolved in a system-dependent way.  On UNIX systems, a
      * relative pathname is made absolute by resolving it against the current
      * user directory.  On Microsoft Windows systems, a relative pathname is made absolute
@@ -658,7 +658,7 @@
     }
 
     /**
-     * Converts this abstract pathname into a <code>file:</code> URL.  The
+     * Converts this abstract pathname into a {@code file:} URL.  The
      * exact form of the URL is system-dependent.  If it can be determined that
      * the file denoted by this abstract pathname is a directory, then the
      * resulting URL will end with a slash.
@@ -751,9 +751,9 @@
      * files that are marked as unreadable. Consequently this method may return
      * {@code true} even though the file does not have read permissions.
      *
-     * @return  <code>true</code> if and only if the file specified by this
+     * @return  {@code true} if and only if the file specified by this
      *          abstract pathname exists <em>and</em> can be read by the
-     *          application; <code>false</code> otherwise
+     *          application; {@code false} otherwise
      *
      * @throws  SecurityException
      *          If a security manager exists and its {@link
@@ -778,10 +778,10 @@
      * files that are marked read-only. Consequently this method may return
      * {@code true} even though the file is marked read-only.
      *
-     * @return  <code>true</code> if and only if the file system actually
+     * @return  {@code true} if and only if the file system actually
      *          contains a file denoted by this abstract pathname <em>and</em>
      *          the application is allowed to write to the file;
-     *          <code>false</code> otherwise.
+     *          {@code false} otherwise.
      *
      * @throws  SecurityException
      *          If a security manager exists and its {@link
@@ -803,8 +803,8 @@
      * Tests whether the file or directory denoted by this abstract pathname
      * exists.
      *
-     * @return  <code>true</code> if and only if the file or directory denoted
-     *          by this abstract pathname exists; <code>false</code> otherwise
+     * @return  {@code true} if and only if the file or directory denoted
+     *          by this abstract pathname exists; {@code false} otherwise
      *
      * @throws  SecurityException
      *          If a security manager exists and its {@link
@@ -832,9 +832,9 @@
      * java.nio.file.Files#readAttributes(Path,Class,LinkOption[])
      * Files.readAttributes} method may be used.
      *
-     * @return <code>true</code> if and only if the file denoted by this
+     * @return {@code true} if and only if the file denoted by this
      *          abstract pathname exists <em>and</em> is a directory;
-     *          <code>false</code> otherwise
+     *          {@code false} otherwise
      *
      * @throws  SecurityException
      *          If a security manager exists and its {@link
@@ -865,9 +865,9 @@
      * java.nio.file.Files#readAttributes(Path,Class,LinkOption[])
      * Files.readAttributes} method may be used.
      *
-     * @return  <code>true</code> if and only if the file denoted by this
+     * @return  {@code true} if and only if the file denoted by this
      *          abstract pathname exists <em>and</em> is a normal file;
-     *          <code>false</code> otherwise
+     *          {@code false} otherwise
      *
      * @throws  SecurityException
      *          If a security manager exists and its {@link
@@ -889,10 +889,10 @@
      * Tests whether the file named by this abstract pathname is a hidden
      * file.  The exact definition of <em>hidden</em> is system-dependent.  On
      * UNIX systems, a file is considered to be hidden if its name begins with
-     * a period character (<code>'.'</code>).  On Microsoft Windows systems, a file is
+     * a period character ({@code '.'}).  On Microsoft Windows systems, a file is
      * considered to be hidden if it has been marked as such in the filesystem.
      *
-     * @return  <code>true</code> if and only if the file denoted by this
+     * @return  {@code true} if and only if the file denoted by this
      *          abstract pathname is hidden according to the conventions of the
      *          underlying platform
      *
@@ -934,9 +934,9 @@
      * {@link java.nio.file.Files#getLastModifiedTime(Path,LinkOption[])
      * Files.getLastModifiedTime} method may be used instead.
      *
-     * @return  A <code>long</code> value representing the time the file was
+     * @return  A {@code long} value representing the time the file was
      *          last modified, measured in milliseconds since the epoch
-     *          (00:00:00 GMT, January 1, 1970), or <code>0L</code> if the
+     *          (00:00:00 GMT, January 1, 1970), or {@code 0L} if the
      *          file does not exist or if an I/O error occurs.  The value may
      *          be negative indicating the number of milliseconds before the
      *          epoch
@@ -968,8 +968,8 @@
      * Files.readAttributes} method may be used.
      *
      * @return  The length, in bytes, of the file denoted by this abstract
-     *          pathname, or <code>0L</code> if the file does not exist.  Some
-     *          operating systems may return <code>0L</code> for pathnames
+     *          pathname, or {@code 0L} if the file does not exist.  Some
+     *          operating systems may return {@code 0L} for pathnames
      *          denoting system-dependent entities such as devices or pipes.
      *
      * @throws  SecurityException
@@ -1003,8 +1003,8 @@
      * {@link java.nio.channels.FileLock FileLock}
      * facility should be used instead.
      *
-     * @return  <code>true</code> if the named file does not exist and was
-     *          successfully created; <code>false</code> if the named file
+     * @return  {@code true} if the named file does not exist and was
+     *          successfully created; {@code false} if the named file
      *          already exists
      *
      * @throws  IOException
@@ -1036,8 +1036,8 @@
      * when a file cannot be deleted. This is useful for error reporting and to
      * diagnose why a file cannot be deleted.
      *
-     * @return  <code>true</code> if and only if the file or directory is
-     *          successfully deleted; <code>false</code> otherwise
+     * @return  {@code true} if and only if the file or directory is
+     *          successfully deleted; {@code false} otherwise
      *
      * @throws  SecurityException
      *          If a security manager exists and its {@link
@@ -1311,8 +1311,8 @@
     /**
      * Creates the directory named by this abstract pathname.
      *
-     * @return  <code>true</code> if and only if the directory was
-     *          created; <code>false</code> otherwise
+     * @return  {@code true} if and only if the directory was
+     *          created; {@code false} otherwise
      *
      * @throws  SecurityException
      *          If a security manager exists and its {@link
@@ -1336,8 +1336,8 @@
      * operation fails it may have succeeded in creating some of the necessary
      * parent directories.
      *
-     * @return  <code>true</code> if and only if the directory was created,
-     *          along with all necessary parent directories; <code>false</code>
+     * @return  {@code true} if and only if the directory was created,
+     *          along with all necessary parent directories; {@code false}
      *          otherwise
      *
      * @throws  SecurityException
@@ -1385,8 +1385,8 @@
      *
      * @param  dest  The new abstract pathname for the named file
      *
-     * @return  <code>true</code> if and only if the renaming succeeded;
-     *          <code>false</code> otherwise
+     * @return  {@code true} if and only if the renaming succeeded;
+     *          {@code false} otherwise
      *
      * @throws  SecurityException
      *          If a security manager exists and its {@link
@@ -1394,7 +1394,7 @@
      *          method denies write access to either the old or new pathnames
      *
      * @throws  NullPointerException
-     *          If parameter <code>dest</code> is <code>null</code>
+     *          If parameter {@code dest} is {@code null}
      */
     public boolean renameTo(File dest) {
         if (dest == null) {
@@ -1420,13 +1420,13 @@
      * the supported precision.  If the operation succeeds and no intervening
      * operations on the file take place, then the next invocation of the
      * {@link #lastModified} method will return the (possibly
-     * truncated) <code>time</code> argument that was passed to this method.
+     * truncated) {@code time} argument that was passed to this method.
      *
      * @param  time  The new last-modified time, measured in milliseconds since
      *               the epoch (00:00:00 GMT, January 1, 1970)
      *
-     * @return <code>true</code> if and only if the operation succeeded;
-     *          <code>false</code> otherwise
+     * @return {@code true} if and only if the operation succeeded;
+     *          {@code false} otherwise
      *
      * @throws  IllegalArgumentException  If the argument is negative
      *
@@ -1458,8 +1458,8 @@
      * files that are marked read-only. Whether or not a read-only file or
      * directory may be deleted depends upon the underlying system.
      *
-     * @return <code>true</code> if and only if the operation succeeded;
-     *          <code>false</code> otherwise
+     * @return {@code true} if and only if the operation succeeded;
+     *          {@code false} otherwise
      *
      * @throws  SecurityException
      *          If a security manager exists and its {@link
@@ -1490,17 +1490,17 @@
      * manipulation of file permissions is required.
      *
      * @param   writable
-     *          If <code>true</code>, sets the access permission to allow write
-     *          operations; if <code>false</code> to disallow write operations
+     *          If {@code true}, sets the access permission to allow write
+     *          operations; if {@code false} to disallow write operations
      *
      * @param   ownerOnly
-     *          If <code>true</code>, the write permission applies only to the
+     *          If {@code true}, the write permission applies only to the
      *          owner's write permission; otherwise, it applies to everybody.  If
      *          the underlying file system can not distinguish the owner's write
      *          permission from that of others, then the permission will apply to
      *          everybody, regardless of this value.
      *
-     * @return  <code>true</code> if and only if the operation succeeded. The
+     * @return  {@code true} if and only if the operation succeeded. The
      *          operation will fail if the user does not have permission to change
      *          the access permissions of this abstract pathname.
      *
@@ -1536,10 +1536,10 @@
      * }</pre>
      *
      * @param   writable
-     *          If <code>true</code>, sets the access permission to allow write
-     *          operations; if <code>false</code> to disallow write operations
+     *          If {@code true}, sets the access permission to allow write
+     *          operations; if {@code false} to disallow write operations
      *
-     * @return  <code>true</code> if and only if the operation succeeded.  The
+     * @return  {@code true} if and only if the operation succeeded.  The
      *          operation will fail if the user does not have permission to
      *          change the access permissions of this abstract pathname.
      *
@@ -1565,20 +1565,20 @@
      * manipulation of file permissions is required.
      *
      * @param   readable
-     *          If <code>true</code>, sets the access permission to allow read
-     *          operations; if <code>false</code> to disallow read operations
+     *          If {@code true}, sets the access permission to allow read
+     *          operations; if {@code false} to disallow read operations
      *
      * @param   ownerOnly
-     *          If <code>true</code>, the read permission applies only to the
+     *          If {@code true}, the read permission applies only to the
      *          owner's read permission; otherwise, it applies to everybody.  If
      *          the underlying file system can not distinguish the owner's read
      *          permission from that of others, then the permission will apply to
      *          everybody, regardless of this value.
      *
-     * @return  <code>true</code> if and only if the operation succeeded.  The
+     * @return  {@code true} if and only if the operation succeeded.  The
      *          operation will fail if the user does not have permission to
      *          change the access permissions of this abstract pathname.  If
-     *          <code>readable</code> is <code>false</code> and the underlying
+     *          {@code readable} is {@code false} and the underlying
      *          file system does not implement a read permission, then the
      *          operation will fail.
      *
@@ -1614,13 +1614,13 @@
      * }</pre>
      *
      * @param  readable
-     *          If <code>true</code>, sets the access permission to allow read
-     *          operations; if <code>false</code> to disallow read operations
+     *          If {@code true}, sets the access permission to allow read
+     *          operations; if {@code false} to disallow read operations
      *
-     * @return  <code>true</code> if and only if the operation succeeded.  The
+     * @return  {@code true} if and only if the operation succeeded.  The
      *          operation will fail if the user does not have permission to
      *          change the access permissions of this abstract pathname.  If
-     *          <code>readable</code> is <code>false</code> and the underlying
+     *          {@code readable} is {@code false} and the underlying
      *          file system does not implement a read permission, then the
      *          operation will fail.
      *
@@ -1646,20 +1646,20 @@
      * manipulation of file permissions is required.
      *
      * @param   executable
-     *          If <code>true</code>, sets the access permission to allow execute
-     *          operations; if <code>false</code> to disallow execute operations
+     *          If {@code true}, sets the access permission to allow execute
+     *          operations; if {@code false} to disallow execute operations
      *
      * @param   ownerOnly
-     *          If <code>true</code>, the execute permission applies only to the
+     *          If {@code true}, the execute permission applies only to the
      *          owner's execute permission; otherwise, it applies to everybody.
      *          If the underlying file system can not distinguish the owner's
      *          execute permission from that of others, then the permission will
      *          apply to everybody, regardless of this value.
      *
-     * @return  <code>true</code> if and only if the operation succeeded.  The
+     * @return  {@code true} if and only if the operation succeeded.  The
      *          operation will fail if the user does not have permission to
      *          change the access permissions of this abstract pathname.  If
-     *          <code>executable</code> is <code>false</code> and the underlying
+     *          {@code executable} is {@code false} and the underlying
      *          file system does not implement an execute permission, then the
      *          operation will fail.
      *
@@ -1695,13 +1695,13 @@
      * }</pre>
      *
      * @param   executable
-     *          If <code>true</code>, sets the access permission to allow execute
-     *          operations; if <code>false</code> to disallow execute operations
+     *          If {@code true}, sets the access permission to allow execute
+     *          operations; if {@code false} to disallow execute operations
      *
-     * @return   <code>true</code> if and only if the operation succeeded.  The
+     * @return   {@code true} if and only if the operation succeeded.  The
      *           operation will fail if the user does not have permission to
      *           change the access permissions of this abstract pathname.  If
-     *           <code>executable</code> is <code>false</code> and the underlying
+     *           {@code executable} is {@code false} and the underlying
      *           file system does not implement an execute permission, then the
      *           operation will fail.
      *
@@ -1723,7 +1723,7 @@
      * files that are not marked executable. Consequently this method may return
      * {@code true} even though the file does not have execute permissions.
      *
-     * @return  <code>true</code> if and only if the abstract pathname exists
+     * @return  {@code true} if and only if the abstract pathname exists
      *          <em>and</em> the application is allowed to execute the file
      *
      * @throws  SecurityException
@@ -2007,28 +2007,28 @@
      * for a file created by this method to be deleted automatically, use the
      * {@link #deleteOnExit} method.
      *
-     * <p> The <code>prefix</code> argument must be at least three characters
+     * <p> The {@code prefix} argument must be at least three characters
      * long.  It is recommended that the prefix be a short, meaningful string
-     * such as <code>"hjb"</code> or <code>"mail"</code>.  The
-     * <code>suffix</code> argument may be <code>null</code>, in which case the
-     * suffix <code>".tmp"</code> will be used.
+     * such as {@code "hjb"} or {@code "mail"}.  The
+     * {@code suffix} argument may be {@code null}, in which case the
+     * suffix {@code ".tmp"} will be used.
      *
      * <p> To create the new file, the prefix and the suffix may first be
      * adjusted to fit the limitations of the underlying platform.  If the
      * prefix is too long then it will be truncated, but its first three
      * characters will always be preserved.  If the suffix is too long then it
      * too will be truncated, but if it begins with a period character
-     * (<code>'.'</code>) then the period and the first three characters
+     * ({@code '.'}) then the period and the first three characters
      * following it will always be preserved.  Once these adjustments have been
      * made the name of the new file will be generated by concatenating the
      * prefix, five or more internally-generated characters, and the suffix.
      *
-     * <p> If the <code>directory</code> argument is <code>null</code> then the
+     * <p> If the {@code directory} argument is {@code null} then the
      * system-dependent default temporary-file directory will be used.  The
      * default temporary-file directory is specified by the system property
-     * <code>java.io.tmpdir</code>.  On UNIX systems the default value of this
-     * property is typically <code>"/tmp"</code> or <code>"/var/tmp"</code>; on
-     * Microsoft Windows systems it is typically <code>"C:\\WINNT\\TEMP"</code>.  A different
+     * {@code java.io.tmpdir}.  On UNIX systems the default value of this
+     * property is typically {@code "/tmp"} or {@code "/var/tmp"}; on
+     * Microsoft Windows systems it is typically {@code "C:\\WINNT\\TEMP"}.  A different
      * value may be given to this system property when the Java virtual machine
      * is invoked, but programmatic changes to this property are not guaranteed
      * to have any effect upon the temporary directory used by this method.
@@ -2037,17 +2037,17 @@
      *                    name; must be at least three characters long
      *
      * @param  suffix     The suffix string to be used in generating the file's
-     *                    name; may be <code>null</code>, in which case the
-     *                    suffix <code>".tmp"</code> will be used
+     *                    name; may be {@code null}, in which case the
+     *                    suffix {@code ".tmp"} will be used
      *
      * @param  directory  The directory in which the file is to be created, or
-     *                    <code>null</code> if the default temporary-file
+     *                    {@code null} if the default temporary-file
      *                    directory is to be used
      *
      * @return  An abstract pathname denoting a newly-created empty file
      *
      * @throws  IllegalArgumentException
-     *          If the <code>prefix</code> argument contains fewer than three
+     *          If the {@code prefix} argument contains fewer than three
      *          characters
      *
      * @throws  IOException  If a file could not be created
@@ -2113,13 +2113,13 @@
      *                    name; must be at least three characters long
      *
      * @param  suffix     The suffix string to be used in generating the file's
-     *                    name; may be <code>null</code>, in which case the
-     *                    suffix <code>".tmp"</code> will be used
+     *                    name; may be {@code null}, in which case the
+     *                    suffix {@code ".tmp"} will be used
      *
      * @return  An abstract pathname denoting a newly-created empty file
      *
      * @throws  IllegalArgumentException
-     *          If the <code>prefix</code> argument contains fewer than three
+     *          If the {@code prefix} argument contains fewer than three
      *          characters
      *
      * @throws  IOException  If a file could not be created
@@ -2163,8 +2163,8 @@
 
     /**
      * Tests this abstract pathname for equality with the given object.
-     * Returns <code>true</code> if and only if the argument is not
-     * <code>null</code> and is an abstract pathname that denotes the same file
+     * Returns {@code true} if and only if the argument is not
+     * {@code null} and is an abstract pathname that denotes the same file
      * or directory as this abstract pathname.  Whether or not two abstract
      * pathnames are equal depends upon the underlying system.  On UNIX
      * systems, alphabetic case is significant in comparing pathnames; on Microsoft Windows
@@ -2172,8 +2172,8 @@
      *
      * @param   obj   The object to be compared with this abstract pathname
      *
-     * @return  <code>true</code> if and only if the objects are the same;
-     *          <code>false</code> otherwise
+     * @return  {@code true} if and only if the objects are the same;
+     *          {@code false} otherwise
      */
     public boolean equals(Object obj) {
         if ((obj != null) && (obj instanceof File)) {
@@ -2188,10 +2188,10 @@
      * of their hash codes.  On UNIX systems, the hash code of an abstract
      * pathname is equal to the exclusive <em>or</em> of the hash code
      * of its pathname string and the decimal value
-     * <code>1234321</code>.  On Microsoft Windows systems, the hash
+     * {@code 1234321}.  On Microsoft Windows systems, the hash
      * code is equal to the exclusive <em>or</em> of the hash code of
      * its pathname string converted to lower case and the decimal
-     * value <code>1234321</code>.  Locale is not taken into account on
+     * value {@code 1234321}.  Locale is not taken into account on
      * lowercasing the pathname string.
      *
      * @return  A hash code for this abstract pathname
--- a/src/java.base/share/classes/java/io/FileFilter.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/FileFilter.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
      * included in a pathname list.
      *
      * @param  pathname  The abstract pathname to be tested
-     * @return  <code>true</code> if and only if <code>pathname</code>
+     * @return  {@code true} if and only if {@code pathname}
      *          should be included
      */
     boolean accept(File pathname);
--- a/src/java.base/share/classes/java/io/FileInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/FileInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -30,13 +30,13 @@
 
 
 /**
- * A <code>FileInputStream</code> obtains input bytes
+ * A {@code FileInputStream} obtains input bytes
  * from a file in a file system. What files
  * are  available depends on the host environment.
  *
- * <p><code>FileInputStream</code> is meant for reading streams of raw bytes
+ * <p>{@code FileInputStream} is meant for reading streams of raw bytes
  * such as image data. For reading streams of characters, consider using
- * <code>FileReader</code>.
+ * {@code FileReader}.
  *
  * @apiNote
  * To release resources used by this stream {@link #close} should be called
@@ -80,21 +80,21 @@
     private volatile boolean closed;
 
     /**
-     * Creates a <code>FileInputStream</code> by
+     * Creates a {@code FileInputStream} by
      * opening a connection to an actual file,
-     * the file named by the path name <code>name</code>
-     * in the file system.  A new <code>FileDescriptor</code>
+     * the file named by the path name {@code name}
+     * in the file system.  A new {@code FileDescriptor}
      * object is created to represent this file
      * connection.
      * <p>
      * First, if there is a security
-     * manager, its <code>checkRead</code> method
-     * is called with the <code>name</code> argument
+     * manager, its {@code checkRead} method
+     * is called with the {@code name} argument
      * as its argument.
      * <p>
      * If the named file does not exist, is a directory rather than a regular
      * file, or for some other reason cannot be opened for reading then a
-     * <code>FileNotFoundException</code> is thrown.
+     * {@code FileNotFoundException} is thrown.
      *
      * @param      name   the system-dependent file name.
      * @throws     FileNotFoundException  if the file does not exist,
@@ -102,7 +102,7 @@
      *             or for some other reason cannot be opened for
      *             reading.
      * @throws     SecurityException      if a security manager exists and its
-     *             <code>checkRead</code> method denies read access
+     *             {@code checkRead} method denies read access
      *             to the file.
      * @see        java.lang.SecurityManager#checkRead(java.lang.String)
      */
@@ -111,21 +111,21 @@
     }
 
     /**
-     * Creates a <code>FileInputStream</code> by
+     * Creates a {@code FileInputStream} by
      * opening a connection to an actual file,
-     * the file named by the <code>File</code>
-     * object <code>file</code> in the file system.
-     * A new <code>FileDescriptor</code> object
+     * the file named by the {@code File}
+     * object {@code file} in the file system.
+     * A new {@code FileDescriptor} object
      * is created to represent this file connection.
      * <p>
      * First, if there is a security manager,
-     * its <code>checkRead</code> method  is called
-     * with the path represented by the <code>file</code>
+     * its {@code checkRead} method  is called
+     * with the path represented by the {@code file}
      * argument as its argument.
      * <p>
      * If the named file does not exist, is a directory rather than a regular
      * file, or for some other reason cannot be opened for reading then a
-     * <code>FileNotFoundException</code> is thrown.
+     * {@code FileNotFoundException} is thrown.
      *
      * @param      file   the file to be opened for reading.
      * @throws     FileNotFoundException  if the file does not exist,
@@ -133,7 +133,7 @@
      *             or for some other reason cannot be opened for
      *             reading.
      * @throws     SecurityException      if a security manager exists and its
-     *             <code>checkRead</code> method denies read access to the file.
+     *             {@code checkRead} method denies read access to the file.
      * @see        java.io.File#getPath()
      * @see        java.lang.SecurityManager#checkRead(java.lang.String)
      */
@@ -157,26 +157,26 @@
     }
 
     /**
-     * Creates a <code>FileInputStream</code> by using the file descriptor
-     * <code>fdObj</code>, which represents an existing connection to an
+     * Creates a {@code FileInputStream} by using the file descriptor
+     * {@code fdObj}, which represents an existing connection to an
      * actual file in the file system.
      * <p>
-     * If there is a security manager, its <code>checkRead</code> method is
-     * called with the file descriptor <code>fdObj</code> as its argument to
+     * If there is a security manager, its {@code checkRead} method is
+     * called with the file descriptor {@code fdObj} as its argument to
      * see if it's ok to read the file descriptor. If read access is denied
-     * to the file descriptor a <code>SecurityException</code> is thrown.
+     * to the file descriptor a {@code SecurityException} is thrown.
      * <p>
-     * If <code>fdObj</code> is null then a <code>NullPointerException</code>
+     * If {@code fdObj} is null then a {@code NullPointerException}
      * is thrown.
      * <p>
-     * This constructor does not throw an exception if <code>fdObj</code>
+     * This constructor does not throw an exception if {@code fdObj}
      * is {@link java.io.FileDescriptor#valid() invalid}.
      * However, if the methods are invoked on the resulting stream to attempt
-     * I/O on the stream, an <code>IOException</code> is thrown.
+     * I/O on the stream, an {@code IOException} is thrown.
      *
      * @param      fdObj   the file descriptor to be opened for reading.
      * @throws     SecurityException      if a security manager exists and its
-     *             <code>checkRead</code> method denies read access to the
+     *             {@code checkRead} method denies read access to the
      *             file descriptor.
      * @see        SecurityManager#checkRead(java.io.FileDescriptor)
      */
@@ -217,7 +217,7 @@
      * Reads a byte of data from this input stream. This method blocks
      * if no input is yet available.
      *
-     * @return     the next byte of data, or <code>-1</code> if the end of the
+     * @return     the next byte of data, or {@code -1} if the end of the
      *             file is reached.
      * @throws     IOException  if an I/O error occurs.
      */
@@ -237,13 +237,13 @@
     private native int readBytes(byte b[], int off, int len) throws IOException;
 
     /**
-     * Reads up to <code>b.length</code> bytes of data from this input
+     * Reads up to {@code b.length} bytes of data from this input
      * stream into an array of bytes. This method blocks until some input
      * is available.
      *
      * @param      b   the buffer into which the data is read.
      * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
+     *             {@code -1} if there is no more data because the end of
      *             the file has been reached.
      * @throws     IOException  if an I/O error occurs.
      */
@@ -252,21 +252,21 @@
     }
 
     /**
-     * Reads up to <code>len</code> bytes of data from this input stream
-     * into an array of bytes. If <code>len</code> is not zero, the method
+     * Reads up to {@code len} bytes of data from this input stream
+     * into an array of bytes. If {@code len} is not zero, the method
      * blocks until some input is available; otherwise, no
-     * bytes are read and <code>0</code> is returned.
+     * bytes are read and {@code 0} is returned.
      *
      * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset in the destination array <code>b</code>
+     * @param      off   the start offset in the destination array {@code b}
      * @param      len   the maximum number of bytes read.
      * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
+     *             {@code -1} if there is no more data because the end of
      *             the file has been reached.
-     * @throws     NullPointerException If <code>b</code> is <code>null</code>.
-     * @throws     IndexOutOfBoundsException If <code>off</code> is negative,
-     *             <code>len</code> is negative, or <code>len</code> is greater than
-     *             <code>b.length - off</code>
+     * @throws     NullPointerException If {@code b} is {@code null}.
+     * @throws     IndexOutOfBoundsException If {@code off} is negative,
+     *             {@code len} is negative, or {@code len} is greater than
+     *             {@code b.length - off}
      * @throws     IOException  if an I/O error occurs.
      */
     public int read(byte b[], int off, int len) throws IOException {
@@ -274,14 +274,14 @@
     }
 
     /**
-     * Skips over and discards <code>n</code> bytes of data from the
+     * Skips over and discards {@code n} bytes of data from the
      * input stream.
      *
-     * <p>The <code>skip</code> method may, for a variety of
+     * <p>The {@code skip} method may, for a variety of
      * reasons, end up skipping over some smaller number of bytes,
-     * possibly <code>0</code>. If <code>n</code> is negative, the method
+     * possibly {@code 0}. If {@code n} is negative, the method
      * will try to skip backwards. In case the backing file does not support
-     * backward skip at its current position, an <code>IOException</code> is
+     * backward skip at its current position, an {@code IOException} is
      * thrown. The actual number of bytes skipped is returned. If it skips
      * forwards, it returns a positive value. If it skips backwards, it
      * returns a negative value.
@@ -372,10 +372,10 @@
     }
 
     /**
-     * Returns the <code>FileDescriptor</code>
+     * Returns the {@code FileDescriptor}
      * object  that represents the connection to
      * the actual file in the file system being
-     * used by this <code>FileInputStream</code>.
+     * used by this {@code FileInputStream}.
      *
      * @return     the file descriptor object associated with this stream.
      * @throws     IOException  if an I/O error occurs.
--- a/src/java.base/share/classes/java/io/FileNotFoundException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/FileNotFoundException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -45,19 +45,19 @@
     private static final long serialVersionUID = -897856973823710492L;
 
     /**
-     * Constructs a <code>FileNotFoundException</code> with
-     * <code>null</code> as its error detail message.
+     * Constructs a {@code FileNotFoundException} with
+     * {@code null} as its error detail message.
      */
     public FileNotFoundException() {
         super();
     }
 
     /**
-     * Constructs a <code>FileNotFoundException</code> with the
-     * specified detail message. The string <code>s</code> can be
+     * Constructs a {@code FileNotFoundException} with the
+     * specified detail message. The string {@code s} can be
      * retrieved later by the
      * <code>{@link java.lang.Throwable#getMessage}</code>
-     * method of class <code>java.lang.Throwable</code>.
+     * method of class {@code java.lang.Throwable}.
      *
      * @param   s   the detail message.
      */
@@ -66,9 +66,9 @@
     }
 
     /**
-     * Constructs a <code>FileNotFoundException</code> with a detail message
+     * Constructs a {@code FileNotFoundException} with a detail message
      * consisting of the given pathname string followed by the given reason
-     * string.  If the <code>reason</code> argument is <code>null</code> then
+     * string.  If the {@code reason} argument is {@code null} then
      * it will be omitted.  This private constructor is invoked only by native
      * I/O methods.
      *
--- a/src/java.base/share/classes/java/io/FileOutputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/FileOutputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -33,16 +33,16 @@
 
 /**
  * A file output stream is an output stream for writing data to a
- * <code>File</code> or to a <code>FileDescriptor</code>. Whether or not
+ * {@code File} or to a {@code FileDescriptor}. Whether or not
  * a file is available or may be created depends upon the underlying
  * platform.  Some platforms, in particular, allow a file to be opened
  * for writing by only one {@code FileOutputStream} (or other
  * file-writing object) at a time.  In such situations the constructors in
  * this class will fail if the file involved is already open.
  *
- * <p><code>FileOutputStream</code> is meant for writing streams of raw bytes
+ * <p>{@code FileOutputStream} is meant for writing streams of raw bytes
  * such as image data. For writing streams of characters, consider using
- * <code>FileWriter</code>.
+ * {@code FileWriter}.
  *
  * @apiNote
  * To release resources used by this stream {@link #close} should be called
@@ -97,15 +97,15 @@
 
     /**
      * Creates a file output stream to write to the file with the
-     * specified name. A new <code>FileDescriptor</code> object is
+     * specified name. A new {@code FileDescriptor} object is
      * created to represent this file connection.
      * <p>
-     * First, if there is a security manager, its <code>checkWrite</code>
-     * method is called with <code>name</code> as its argument.
+     * First, if there is a security manager, its {@code checkWrite}
+     * method is called with {@code name} as its argument.
      * <p>
      * If the file exists but is a directory rather than a regular file, does
      * not exist but cannot be created, or cannot be opened for any other
-     * reason then a <code>FileNotFoundException</code> is thrown.
+     * reason then a {@code FileNotFoundException} is thrown.
      *
      * @implSpec Invoking this constructor with the parameter {@code name} is
      * equivalent to invoking {@link #FileOutputStream(String,boolean)
@@ -116,7 +116,7 @@
      *                   rather than a regular file, does not exist but cannot
      *                   be created, or cannot be opened for any other reason
      * @throws     SecurityException  if a security manager exists and its
-     *               <code>checkWrite</code> method denies write access
+     *               {@code checkWrite} method denies write access
      *               to the file.
      * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
      */
@@ -126,26 +126,26 @@
 
     /**
      * Creates a file output stream to write to the file with the specified
-     * name.  If the second argument is <code>true</code>, then
+     * name.  If the second argument is {@code true}, then
      * bytes will be written to the end of the file rather than the beginning.
-     * A new <code>FileDescriptor</code> object is created to represent this
+     * A new {@code FileDescriptor} object is created to represent this
      * file connection.
      * <p>
-     * First, if there is a security manager, its <code>checkWrite</code>
-     * method is called with <code>name</code> as its argument.
+     * First, if there is a security manager, its {@code checkWrite}
+     * method is called with {@code name} as its argument.
      * <p>
      * If the file exists but is a directory rather than a regular file, does
      * not exist but cannot be created, or cannot be opened for any other
-     * reason then a <code>FileNotFoundException</code> is thrown.
+     * reason then a {@code FileNotFoundException} is thrown.
      *
      * @param     name        the system-dependent file name
-     * @param     append      if <code>true</code>, then bytes will be written
+     * @param     append      if {@code true}, then bytes will be written
      *                   to the end of the file rather than the beginning
      * @throws     FileNotFoundException  if the file exists but is a directory
      *                   rather than a regular file, does not exist but cannot
      *                   be created, or cannot be opened for any other reason.
      * @throws     SecurityException  if a security manager exists and its
-     *               <code>checkWrite</code> method denies write access
+     *               {@code checkWrite} method denies write access
      *               to the file.
      * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
      * @since     1.1
@@ -158,24 +158,24 @@
 
     /**
      * Creates a file output stream to write to the file represented by
-     * the specified <code>File</code> object. A new
-     * <code>FileDescriptor</code> object is created to represent this
+     * the specified {@code File} object. A new
+     * {@code FileDescriptor} object is created to represent this
      * file connection.
      * <p>
-     * First, if there is a security manager, its <code>checkWrite</code>
-     * method is called with the path represented by the <code>file</code>
+     * First, if there is a security manager, its {@code checkWrite}
+     * method is called with the path represented by the {@code file}
      * argument as its argument.
      * <p>
      * If the file exists but is a directory rather than a regular file, does
      * not exist but cannot be created, or cannot be opened for any other
-     * reason then a <code>FileNotFoundException</code> is thrown.
+     * reason then a {@code FileNotFoundException} is thrown.
      *
      * @param      file               the file to be opened for writing.
      * @throws     FileNotFoundException  if the file exists but is a directory
      *                   rather than a regular file, does not exist but cannot
      *                   be created, or cannot be opened for any other reason
      * @throws     SecurityException  if a security manager exists and its
-     *               <code>checkWrite</code> method denies write access
+     *               {@code checkWrite} method denies write access
      *               to the file.
      * @see        java.io.File#getPath()
      * @see        java.lang.SecurityException
@@ -187,27 +187,27 @@
 
     /**
      * Creates a file output stream to write to the file represented by
-     * the specified <code>File</code> object. If the second argument is
-     * <code>true</code>, then bytes will be written to the end of the file
-     * rather than the beginning. A new <code>FileDescriptor</code> object is
+     * the specified {@code File} object. If the second argument is
+     * {@code true}, then bytes will be written to the end of the file
+     * rather than the beginning. A new {@code FileDescriptor} object is
      * created to represent this file connection.
      * <p>
-     * First, if there is a security manager, its <code>checkWrite</code>
-     * method is called with the path represented by the <code>file</code>
+     * First, if there is a security manager, its {@code checkWrite}
+     * method is called with the path represented by the {@code file}
      * argument as its argument.
      * <p>
      * If the file exists but is a directory rather than a regular file, does
      * not exist but cannot be created, or cannot be opened for any other
-     * reason then a <code>FileNotFoundException</code> is thrown.
+     * reason then a {@code FileNotFoundException} is thrown.
      *
      * @param      file               the file to be opened for writing.
-     * @param     append      if <code>true</code>, then bytes will be written
+     * @param     append      if {@code true}, then bytes will be written
      *                   to the end of the file rather than the beginning
      * @throws     FileNotFoundException  if the file exists but is a directory
      *                   rather than a regular file, does not exist but cannot
      *                   be created, or cannot be opened for any other reason
      * @throws     SecurityException  if a security manager exists and its
-     *               <code>checkWrite</code> method denies write access
+     *               {@code checkWrite} method denies write access
      *               to the file.
      * @see        java.io.File#getPath()
      * @see        java.lang.SecurityException
@@ -241,21 +241,21 @@
      * descriptor, which represents an existing connection to an actual
      * file in the file system.
      * <p>
-     * First, if there is a security manager, its <code>checkWrite</code>
-     * method is called with the file descriptor <code>fdObj</code>
+     * First, if there is a security manager, its {@code checkWrite}
+     * method is called with the file descriptor {@code fdObj}
      * argument as its argument.
      * <p>
-     * If <code>fdObj</code> is null then a <code>NullPointerException</code>
+     * If {@code fdObj} is null then a {@code NullPointerException}
      * is thrown.
      * <p>
-     * This constructor does not throw an exception if <code>fdObj</code>
+     * This constructor does not throw an exception if {@code fdObj}
      * is {@link java.io.FileDescriptor#valid() invalid}.
      * However, if the methods are invoked on the resulting stream to attempt
-     * I/O on the stream, an <code>IOException</code> is thrown.
+     * I/O on the stream, an {@code IOException} is thrown.
      *
      * @param      fdObj   the file descriptor to be opened for writing
      * @throws     SecurityException  if a security manager exists and its
-     *               <code>checkWrite</code> method denies
+     *               {@code checkWrite} method denies
      *               write access to the file descriptor
      * @see        java.lang.SecurityManager#checkWrite(java.io.FileDescriptor)
      */
@@ -303,7 +303,7 @@
 
     /**
      * Writes the specified byte to this file output stream. Implements
-     * the <code>write</code> method of <code>OutputStream</code>.
+     * the {@code write} method of {@code OutputStream}.
      *
      * @param      b   the byte to be written.
      * @throws     IOException  if an I/O error occurs.
@@ -325,7 +325,7 @@
         throws IOException;
 
     /**
-     * Writes <code>b.length</code> bytes from the specified byte array
+     * Writes {@code b.length} bytes from the specified byte array
      * to this file output stream.
      *
      * @param      b   the data.
@@ -336,8 +336,8 @@
     }
 
     /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to this file output stream.
+     * Writes {@code len} bytes from the specified byte array
+     * starting at offset {@code off} to this file output stream.
      *
      * @param      b     the data.
      * @param      off   the start offset in the data.
@@ -397,9 +397,9 @@
     /**
      * Returns the file descriptor associated with this stream.
      *
-     * @return  the <code>FileDescriptor</code> object that represents
+     * @return  the {@code FileDescriptor} object that represents
      *          the connection to the file in the file system being used
-     *          by this <code>FileOutputStream</code> object.
+     *          by this {@code FileOutputStream} object.
      *
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FileDescriptor
--- a/src/java.base/share/classes/java/io/FilePermission.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/FilePermission.java	Tue Sep 24 09:43:43 2019 +0100
@@ -46,7 +46,7 @@
  * <P>
  * Pathname is the pathname of the file or directory granted the specified
  * actions. A pathname that ends in "/*" (where "/" is
- * the file separator character, <code>File.separatorChar</code>) indicates
+ * the file separator character, {@code File.separatorChar}) indicates
  * all the files and directories contained in that directory. A pathname
  * that ends with "/-" indicates (recursively) all files
  * and subdirectories contained in that directory. Such a pathname is called
@@ -70,11 +70,11 @@
  *    <DT> read <DD> read permission
  *    <DT> write <DD> write permission
  *    <DT> execute
- *    <DD> execute permission. Allows <code>Runtime.exec</code> to
- *         be called. Corresponds to <code>SecurityManager.checkExec</code>.
+ *    <DD> execute permission. Allows {@code Runtime.exec} to
+ *         be called. Corresponds to {@code SecurityManager.checkExec}.
  *    <DT> delete
- *    <DD> delete permission. Allows <code>File.delete</code> to
- *         be called. Corresponds to <code>SecurityManager.checkDelete</code>.
+ *    <DD> delete permission. Allows {@code File.delete} to
+ *         be called. Corresponds to {@code SecurityManager.checkDelete}.
  *    <DT> readlink
  *    <DD> read link permission. Allows the target of a
  *         <a href="../nio/file/package-summary.html#links">symbolic link</a>
@@ -426,7 +426,7 @@
      * "read", "write", "execute", "delete", and "readlink".
      *
      * <p>A pathname that ends in "/*" (where "/" is
-     * the file separator character, <code>File.separatorChar</code>)
+     * the file separator character, {@code File.separatorChar})
      * indicates all the files and directories contained in that directory.
      * A pathname that ends with "/-" indicates (recursively) all files and
      * subdirectories contained in that directory. The special pathname
@@ -468,7 +468,7 @@
      * @param actions the action string.
      *
      * @throws IllegalArgumentException
-     *          If actions is <code>null</code>, empty or contains an action
+     *          If actions is {@code null}, empty or contains an action
      *          other than the specified possible actions.
      */
     public FilePermission(String path, String actions) {
@@ -481,7 +481,7 @@
      * More efficient than the FilePermission(String, String) constructor.
      * Can be used from within
      * code that needs to create a FilePermission object to pass into the
-     * <code>implies</code> method.
+     * {@code implies} method.
      *
      * @param path the pathname of the file/directory.
      * @param mask the action mask to use.
@@ -547,9 +547,9 @@
      *
      * @param p the permission to check against.
      *
-     * @return <code>true</code> if the specified permission is not
-     *                  <code>null</code> and is implied by this object,
-     *                  <code>false</code> otherwise.
+     * @return {@code true} if the specified permission is not
+     *                  {@code null} and is implied by this object,
+     *                  {@code false} otherwise.
      */
     @Override
     public boolean implies(Permission p) {
@@ -769,9 +769,9 @@
      * for itself, even if they are created using the same invalid path.
      *
      * @param obj the object we are testing for equality with this object.
-     * @return <code>true</code> if obj is a FilePermission, and has the same
+     * @return {@code true} if obj is a FilePermission, and has the same
      *          pathname and actions as this FilePermission object,
-     *          <code>false</code> otherwise.
+     *          {@code false} otherwise.
      */
     @Override
     public boolean equals(Object obj) {
@@ -987,7 +987,7 @@
      * Returns the "canonical string representation" of the actions.
      * That is, this method always returns present actions in the following order:
      * read, write, execute, delete, readlink. For example, if this FilePermission
-     * object allows both write and read actions, a call to <code>getActions</code>
+     * object allows both write and read actions, a call to {@code getActions}
      * will return the string "read,write".
      *
      * @return the canonical string representation of the actions.
@@ -1006,27 +1006,27 @@
      * <p>
      * FilePermission objects must be stored in a manner that allows them
      * to be inserted into the collection in any order, but that also enables the
-     * PermissionCollection <code>implies</code>
+     * PermissionCollection {@code implies}
      * method to be implemented in an efficient (and consistent) manner.
      *
      * <p>For example, if you have two FilePermissions:
      * <OL>
-     * <LI>  <code>"/tmp/-", "read"</code>
-     * <LI>  <code>"/tmp/scratch/foo", "write"</code>
+     * <LI>  {@code "/tmp/-", "read"}
+     * <LI>  {@code "/tmp/scratch/foo", "write"}
      * </OL>
      *
-     * <p>and you are calling the <code>implies</code> method with the FilePermission:
+     * <p>and you are calling the {@code implies} method with the FilePermission:
      *
      * <pre>
      *   "/tmp/scratch/foo", "read,write",
      * </pre>
      *
-     * then the <code>implies</code> function must
+     * then the {@code implies} function must
      * take into account both the "/tmp/-" and "/tmp/scratch/foo"
      * permissions, so the effective permission is "read,write",
-     * and <code>implies</code> returns true. The "implies" semantics for
+     * and {@code implies} returns true. The "implies" semantics for
      * FilePermissions are handled properly by the PermissionCollection object
-     * returned by this <code>newPermissionCollection</code> method.
+     * returned by this {@code newPermissionCollection} method.
      *
      * @return a new PermissionCollection object suitable for storing
      * FilePermissions.
--- a/src/java.base/share/classes/java/io/FileSystem.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/FileSystem.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,7 +148,7 @@
 
     /**
      * Create a new empty file with the given pathname.  Return
-     * <code>true</code> if the file was created and <code>false</code> if a
+     * {@code true} if the file was created and {@code false} if a
      * file or directory with the given pathname already exists.  Throw an
      * IOException if an I/O error occurs.
      */
@@ -157,40 +157,40 @@
 
     /**
      * Delete the file or directory denoted by the given abstract pathname,
-     * returning <code>true</code> if and only if the operation succeeds.
+     * returning {@code true} if and only if the operation succeeds.
      */
     public abstract boolean delete(File f);
 
     /**
      * List the elements of the directory denoted by the given abstract
      * pathname.  Return an array of strings naming the elements of the
-     * directory if successful; otherwise, return <code>null</code>.
+     * directory if successful; otherwise, return {@code null}.
      */
     public abstract String[] list(File f);
 
     /**
      * Create a new directory denoted by the given abstract pathname,
-     * returning <code>true</code> if and only if the operation succeeds.
+     * returning {@code true} if and only if the operation succeeds.
      */
     public abstract boolean createDirectory(File f);
 
     /**
      * Rename the file or directory denoted by the first abstract pathname to
-     * the second abstract pathname, returning <code>true</code> if and only if
+     * the second abstract pathname, returning {@code true} if and only if
      * the operation succeeds.
      */
     public abstract boolean rename(File f1, File f2);
 
     /**
      * Set the last-modified time of the file or directory denoted by the
-     * given abstract pathname, returning <code>true</code> if and only if the
+     * given abstract pathname, returning {@code true} if and only if the
      * operation succeeds.
      */
     public abstract boolean setLastModifiedTime(File f, long time);
 
     /**
      * Mark the file or directory denoted by the given abstract pathname as
-     * read-only, returning <code>true</code> if and only if the operation
+     * read-only, returning {@code true} if and only if the operation
      * succeeds.
      */
     public abstract boolean setReadOnly(File f);
--- a/src/java.base/share/classes/java/io/FilenameFilter.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/FilenameFilter.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,8 @@
 /**
  * Instances of classes that implement this interface are used to
  * filter filenames. These instances are used to filter directory
- * listings in the <code>list</code> method of class
- * <code>File</code>, and by the Abstract Window Toolkit's file
+ * listings in the {@code list} method of class
+ * {@code File}, and by the Abstract Window Toolkit's file
  * dialog component.
  *
  * @author  Arthur van Hoff
@@ -46,8 +46,8 @@
      *
      * @param   dir    the directory in which the file was found.
      * @param   name   the name of the file.
-     * @return  <code>true</code> if and only if the name should be
-     * included in the file list; <code>false</code> otherwise.
+     * @return  {@code true} if and only if the name should be
+     * included in the file list; {@code false} otherwise.
      */
     boolean accept(File dir, String name);
 }
--- a/src/java.base/share/classes/java/io/FilterInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/FilterInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -26,15 +26,15 @@
 package java.io;
 
 /**
- * A <code>FilterInputStream</code> contains
+ * A {@code FilterInputStream} contains
  * some other input stream, which it uses as
  * its  basic source of data, possibly transforming
  * the data along the way or providing  additional
- * functionality. The class <code>FilterInputStream</code>
+ * functionality. The class {@code FilterInputStream}
  * itself simply overrides all  methods of
- * <code>InputStream</code> with versions that
+ * {@code InputStream} with versions that
  * pass all requests to the contained  input
- * stream. Subclasses of <code>FilterInputStream</code>
+ * stream. Subclasses of {@code FilterInputStream}
  * may further override some of  these methods
  * and may also provide additional methods
  * and fields.
@@ -50,12 +50,12 @@
     protected volatile InputStream in;
 
     /**
-     * Creates a <code>FilterInputStream</code>
-     * by assigning the  argument <code>in</code>
-     * to the field <code>this.in</code> so as
+     * Creates a {@code FilterInputStream}
+     * by assigning the  argument {@code in}
+     * to the field {@code this.in} so as
      * to remember it for later use.
      *
-     * @param   in   the underlying input stream, or <code>null</code> if
+     * @param   in   the underlying input stream, or {@code null} if
      *          this instance is to be created without an underlying stream.
      */
     protected FilterInputStream(InputStream in) {
@@ -64,17 +64,17 @@
 
     /**
      * Reads the next byte of data from this input stream. The value
-     * byte is returned as an <code>int</code> in the range
-     * <code>0</code> to <code>255</code>. If no byte is available
+     * byte is returned as an {@code int} in the range
+     * {@code 0} to {@code 255}. If no byte is available
      * because the end of the stream has been reached, the value
-     * <code>-1</code> is returned. This method blocks until input data
+     * {@code -1} is returned. This method blocks until input data
      * is available, the end of the stream is detected, or an exception
      * is thrown.
      * <p>
      * This method
-     * simply performs <code>in.read()</code> and returns the result.
+     * simply performs {@code in.read()} and returns the result.
      *
-     * @return     the next byte of data, or <code>-1</code> if the end of the
+     * @return     the next byte of data, or {@code -1} if the end of the
      *             stream is reached.
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterInputStream#in
@@ -84,21 +84,21 @@
     }
 
     /**
-     * Reads up to <code>b.length</code> bytes of data from this
+     * Reads up to {@code b.length} bytes of data from this
      * input stream into an array of bytes. This method blocks until some
      * input is available.
      * <p>
      * This method simply performs the call
-     * <code>read(b, 0, b.length)</code> and returns
+     * {@code read(b, 0, b.length)} and returns
      * the  result. It is important that it does
-     * <i>not</i> do <code>in.read(b)</code> instead;
-     * certain subclasses of  <code>FilterInputStream</code>
+     * <i>not</i> do {@code in.read(b)} instead;
+     * certain subclasses of  {@code FilterInputStream}
      * depend on the implementation strategy actually
      * used.
      *
      * @param      b   the buffer into which the data is read.
      * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
+     *             {@code -1} if there is no more data because the end of
      *             the stream has been reached.
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterInputStream#read(byte[], int, int)
@@ -108,24 +108,24 @@
     }
 
     /**
-     * Reads up to <code>len</code> bytes of data from this input stream
-     * into an array of bytes. If <code>len</code> is not zero, the method
+     * Reads up to {@code len} bytes of data from this input stream
+     * into an array of bytes. If {@code len} is not zero, the method
      * blocks until some input is available; otherwise, no
-     * bytes are read and <code>0</code> is returned.
+     * bytes are read and {@code 0} is returned.
      * <p>
-     * This method simply performs <code>in.read(b, off, len)</code>
+     * This method simply performs {@code in.read(b, off, len)}
      * and returns the result.
      *
      * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset in the destination array <code>b</code>
+     * @param      off   the start offset in the destination array {@code b}
      * @param      len   the maximum number of bytes read.
      * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
+     *             {@code -1} if there is no more data because the end of
      *             the stream has been reached.
-     * @throws     NullPointerException If <code>b</code> is <code>null</code>.
-     * @throws     IndexOutOfBoundsException If <code>off</code> is negative,
-     *             <code>len</code> is negative, or <code>len</code> is greater than
-     *             <code>b.length - off</code>
+     * @throws     NullPointerException If {@code b} is {@code null}.
+     * @throws     IndexOutOfBoundsException If {@code off} is negative,
+     *             {@code len} is negative, or {@code len} is greater than
+     *             {@code b.length - off}
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterInputStream#in
      */
@@ -134,13 +134,13 @@
     }
 
     /**
-     * Skips over and discards <code>n</code> bytes of data from the
-     * input stream. The <code>skip</code> method may, for a variety of
+     * Skips over and discards {@code n} bytes of data from the
+     * input stream. The {@code skip} method may, for a variety of
      * reasons, end up skipping over some smaller number of bytes,
-     * possibly <code>0</code>. The actual number of bytes skipped is
+     * possibly {@code 0}. The actual number of bytes skipped is
      * returned.
      * <p>
-     * This method simply performs <code>in.skip(n)</code>.
+     * This method simply performs {@code in.skip(n)}.
      *
      * @param      n   the number of bytes to be skipped.
      * @return     the actual number of bytes skipped.
@@ -171,7 +171,7 @@
      * Closes this input stream and releases any system resources
      * associated with the stream.
      * This
-     * method simply performs <code>in.close()</code>.
+     * method simply performs {@code in.close()}.
      *
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterInputStream#in
@@ -182,14 +182,14 @@
 
     /**
      * Marks the current position in this input stream. A subsequent
-     * call to the <code>reset</code> method repositions this stream at
+     * call to the {@code reset} method repositions this stream at
      * the last marked position so that subsequent reads re-read the same bytes.
      * <p>
-     * The <code>readlimit</code> argument tells this input stream to
+     * The {@code readlimit} argument tells this input stream to
      * allow that many bytes to be read before the mark position gets
      * invalidated.
      * <p>
-     * This method simply performs <code>in.mark(readlimit)</code>.
+     * This method simply performs {@code in.mark(readlimit)}.
      *
      * @param   readlimit   the maximum limit of bytes that can be read before
      *                      the mark position becomes invalid.
@@ -202,10 +202,10 @@
 
     /**
      * Repositions this stream to the position at the time the
-     * <code>mark</code> method was last called on this input stream.
+     * {@code mark} method was last called on this input stream.
      * <p>
      * This method
-     * simply performs <code>in.reset()</code>.
+     * simply performs {@code in.reset()}.
      * <p>
      * Stream marks are intended to be used in
      * situations where you need to read ahead a little to see what's in
@@ -226,14 +226,14 @@
     }
 
     /**
-     * Tests if this input stream supports the <code>mark</code>
-     * and <code>reset</code> methods.
+     * Tests if this input stream supports the {@code mark}
+     * and {@code reset} methods.
      * This method
-     * simply performs <code>in.markSupported()</code>.
+     * simply performs {@code in.markSupported()}.
      *
-     * @return  <code>true</code> if this stream type supports the
-     *          <code>mark</code> and <code>reset</code> method;
-     *          <code>false</code> otherwise.
+     * @return  {@code true} if this stream type supports the
+     *          {@code mark} and {@code reset} method;
+     *          {@code false} otherwise.
      * @see     java.io.FilterInputStream#in
      * @see     java.io.InputStream#mark(int)
      * @see     java.io.InputStream#reset()
--- a/src/java.base/share/classes/java/io/FilterOutputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/FilterOutputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -32,10 +32,10 @@
  * basic sink of data, but possibly transforming the data along the
  * way or providing additional functionality.
  * <p>
- * The class <code>FilterOutputStream</code> itself simply overrides
- * all methods of <code>OutputStream</code> with versions that pass
+ * The class {@code FilterOutputStream} itself simply overrides
+ * all methods of {@code OutputStream} with versions that pass
  * all requests to the underlying output stream. Subclasses of
- * <code>FilterOutputStream</code> may further override some of these
+ * {@code FilterOutputStream} may further override some of these
  * methods as well as provide additional methods and fields.
  *
  * @author  Jonathan Payne
@@ -63,7 +63,7 @@
      *
      * @param   out   the underlying output stream to be assigned to
      *                the field {@code this.out} for later use, or
-     *                <code>null</code> if this instance is to be
+     *                {@code null} if this instance is to be
      *                created without an underlying stream.
      */
     public FilterOutputStream(OutputStream out) {
@@ -71,15 +71,15 @@
     }
 
     /**
-     * Writes the specified <code>byte</code> to this output stream.
+     * Writes the specified {@code byte} to this output stream.
      * <p>
-     * The <code>write</code> method of <code>FilterOutputStream</code>
-     * calls the <code>write</code> method of its underlying output stream,
+     * The {@code write} method of {@code FilterOutputStream}
+     * calls the {@code write} method of its underlying output stream,
      * that is, it performs {@code out.write(b)}.
      * <p>
      * Implements the abstract {@code write} method of {@code OutputStream}.
      *
-     * @param      b   the <code>byte</code>.
+     * @param      b   the {@code byte}.
      * @throws     IOException  if an I/O error occurs.
      */
     @Override
@@ -88,16 +88,16 @@
     }
 
     /**
-     * Writes <code>b.length</code> bytes to this output stream.
+     * Writes {@code b.length} bytes to this output stream.
      * <p>
-     * The <code>write</code> method of <code>FilterOutputStream</code>
-     * calls its <code>write</code> method of three arguments with the
-     * arguments <code>b</code>, <code>0</code>, and
-     * <code>b.length</code>.
+     * The {@code write} method of {@code FilterOutputStream}
+     * calls its {@code write} method of three arguments with the
+     * arguments {@code b}, {@code 0}, and
+     * {@code b.length}.
      * <p>
      * Note that this method does not call the one-argument
-     * <code>write</code> method of its underlying output stream with
-     * the single argument <code>b</code>.
+     * {@code write} method of its underlying output stream with
+     * the single argument {@code b}.
      *
      * @param      b   the data to be written.
      * @throws     IOException  if an I/O error occurs.
@@ -109,17 +109,17 @@
     }
 
     /**
-     * Writes <code>len</code> bytes from the specified
-     * <code>byte</code> array starting at offset <code>off</code> to
+     * Writes {@code len} bytes from the specified
+     * {@code byte} array starting at offset {@code off} to
      * this output stream.
      * <p>
-     * The <code>write</code> method of <code>FilterOutputStream</code>
-     * calls the <code>write</code> method of one argument on each
-     * <code>byte</code> to output.
+     * The {@code write} method of {@code FilterOutputStream}
+     * calls the {@code write} method of one argument on each
+     * {@code byte} to output.
      * <p>
-     * Note that this method does not call the <code>write</code> method
+     * Note that this method does not call the {@code write} method
      * of its underlying output stream with the same arguments. Subclasses
-     * of <code>FilterOutputStream</code> should provide a more efficient
+     * of {@code FilterOutputStream} should provide a more efficient
      * implementation of this method.
      *
      * @param      b     the data.
@@ -142,8 +142,8 @@
      * Flushes this output stream and forces any buffered output bytes
      * to be written out to the stream.
      * <p>
-     * The <code>flush</code> method of <code>FilterOutputStream</code>
-     * calls the <code>flush</code> method of its underlying output stream.
+     * The {@code flush} method of {@code FilterOutputStream}
+     * calls the {@code flush} method of its underlying output stream.
      *
      * @throws     IOException  if an I/O error occurs.
      * @see        java.io.FilterOutputStream#out
--- a/src/java.base/share/classes/java/io/FilterReader.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/FilterReader.java	Tue Sep 24 09:43:43 2019 +0100
@@ -28,9 +28,9 @@
 
 /**
  * Abstract class for reading filtered character streams.
- * The abstract class <code>FilterReader</code> itself
+ * The abstract class {@code FilterReader} itself
  * provides default methods that pass all requests to
- * the contained stream. Subclasses of <code>FilterReader</code>
+ * the contained stream. Subclasses of {@code FilterReader}
  * should override some of these methods and may also provide
  * additional methods and fields.
  *
@@ -49,7 +49,7 @@
      * Creates a new filtered reader.
      *
      * @param in  a Reader object providing the underlying stream.
-     * @throws NullPointerException if <code>in</code> is <code>null</code>
+     * @throws NullPointerException if {@code in} is {@code null}
      */
     protected FilterReader(Reader in) {
         super(in);
--- a/src/java.base/share/classes/java/io/FilterWriter.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/FilterWriter.java	Tue Sep 24 09:43:43 2019 +0100
@@ -28,9 +28,9 @@
 
 /**
  * Abstract class for writing filtered character streams.
- * The abstract class <code>FilterWriter</code> itself
+ * The abstract class {@code FilterWriter} itself
  * provides default methods that pass all requests to the
- * contained stream. Subclasses of <code>FilterWriter</code>
+ * contained stream. Subclasses of {@code FilterWriter}
  * should override some of these methods and may also
  * provide additional methods and fields.
  *
@@ -49,7 +49,7 @@
      * Create a new filtered writer.
      *
      * @param out  a Writer object to provide the underlying stream.
-     * @throws NullPointerException if <code>out</code> is <code>null</code>
+     * @throws NullPointerException if {@code out} is {@code null}
      */
     protected FilterWriter(Writer out) {
         super(out);
--- a/src/java.base/share/classes/java/io/InputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/InputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -34,7 +34,7 @@
  * This abstract class is the superclass of all classes representing
  * an input stream of bytes.
  *
- * <p> Applications that need to define a subclass of <code>InputStream</code>
+ * <p> Applications that need to define a subclass of {@code InputStream}
  * must always provide a method that returns the next byte of input.
  *
  * @author  Arthur van Hoff
@@ -167,15 +167,15 @@
 
     /**
      * Reads the next byte of data from the input stream. The value byte is
-     * returned as an <code>int</code> in the range <code>0</code> to
-     * <code>255</code>. If no byte is available because the end of the stream
-     * has been reached, the value <code>-1</code> is returned. This method
+     * returned as an {@code int} in the range {@code 0} to
+     * {@code 255}. If no byte is available because the end of the stream
+     * has been reached, the value {@code -1} is returned. This method
      * blocks until input data is available, the end of the stream is detected,
      * or an exception is thrown.
      *
      * <p> A subclass must provide an implementation of this method.
      *
-     * @return     the next byte of data, or <code>-1</code> if the end of the
+     * @return     the next byte of data, or {@code -1} if the end of the
      *             stream is reached.
      * @throws     IOException  if an I/O error occurs.
      */
@@ -183,35 +183,35 @@
 
     /**
      * Reads some number of bytes from the input stream and stores them into
-     * the buffer array <code>b</code>. The number of bytes actually read is
+     * the buffer array {@code b}. The number of bytes actually read is
      * returned as an integer.  This method blocks until input data is
      * available, end of file is detected, or an exception is thrown.
      *
-     * <p> If the length of <code>b</code> is zero, then no bytes are read and
-     * <code>0</code> is returned; otherwise, there is an attempt to read at
+     * <p> If the length of {@code b} is zero, then no bytes are read and
+     * {@code 0} is returned; otherwise, there is an attempt to read at
      * least one byte. If no byte is available because the stream is at the
-     * end of the file, the value <code>-1</code> is returned; otherwise, at
-     * least one byte is read and stored into <code>b</code>.
+     * end of the file, the value {@code -1} is returned; otherwise, at
+     * least one byte is read and stored into {@code b}.
      *
-     * <p> The first byte read is stored into element <code>b[0]</code>, the
-     * next one into <code>b[1]</code>, and so on. The number of bytes read is,
-     * at most, equal to the length of <code>b</code>. Let <i>k</i> be the
+     * <p> The first byte read is stored into element {@code b[0]}, the
+     * next one into {@code b[1]}, and so on. The number of bytes read is,
+     * at most, equal to the length of {@code b}. Let <i>k</i> be the
      * number of bytes actually read; these bytes will be stored in elements
-     * <code>b[0]</code> through <code>b[</code><i>k</i><code>-1]</code>,
-     * leaving elements <code>b[</code><i>k</i><code>]</code> through
-     * <code>b[b.length-1]</code> unaffected.
+     * {@code b[0]} through {@code b[}<i>k</i>{@code -1]},
+     * leaving elements {@code b[}<i>k</i>{@code ]} through
+     * {@code b[b.length-1]} unaffected.
      *
-     * <p> The <code>read(b)</code> method for class <code>InputStream</code>
-     * has the same effect as: <pre><code> read(b, 0, b.length) </code></pre>
+     * <p> The {@code read(b)} method for class {@code InputStream}
+     * has the same effect as: <pre>{@code  read(b, 0, b.length) }</pre>
      *
      * @param      b   the buffer into which the data is read.
      * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
+     *             {@code -1} if there is no more data because the end of
      *             the stream has been reached.
      * @throws     IOException  If the first byte cannot be read for any reason
      *             other than the end of the file, if the input stream has been
      *             closed, or if some other I/O error occurs.
-     * @throws     NullPointerException  if <code>b</code> is <code>null</code>.
+     * @throws     NullPointerException  if {@code b} is {@code null}.
      * @see        java.io.InputStream#read(byte[], int, int)
      */
     public int read(byte b[]) throws IOException {
@@ -219,60 +219,60 @@
     }
 
     /**
-     * Reads up to <code>len</code> bytes of data from the input stream into
+     * Reads up to {@code len} bytes of data from the input stream into
      * an array of bytes.  An attempt is made to read as many as
-     * <code>len</code> bytes, but a smaller number may be read.
+     * {@code len} bytes, but a smaller number may be read.
      * The number of bytes actually read is returned as an integer.
      *
      * <p> This method blocks until input data is available, end of file is
      * detected, or an exception is thrown.
      *
-     * <p> If <code>len</code> is zero, then no bytes are read and
-     * <code>0</code> is returned; otherwise, there is an attempt to read at
+     * <p> If {@code len} is zero, then no bytes are read and
+     * {@code 0} is returned; otherwise, there is an attempt to read at
      * least one byte. If no byte is available because the stream is at end of
-     * file, the value <code>-1</code> is returned; otherwise, at least one
-     * byte is read and stored into <code>b</code>.
+     * file, the value {@code -1} is returned; otherwise, at least one
+     * byte is read and stored into {@code b}.
      *
-     * <p> The first byte read is stored into element <code>b[off]</code>, the
-     * next one into <code>b[off+1]</code>, and so on. The number of bytes read
-     * is, at most, equal to <code>len</code>. Let <i>k</i> be the number of
+     * <p> The first byte read is stored into element {@code b[off]}, the
+     * next one into {@code b[off+1]}, and so on. The number of bytes read
+     * is, at most, equal to {@code len}. Let <i>k</i> be the number of
      * bytes actually read; these bytes will be stored in elements
-     * <code>b[off]</code> through <code>b[off+</code><i>k</i><code>-1]</code>,
-     * leaving elements <code>b[off+</code><i>k</i><code>]</code> through
-     * <code>b[off+len-1]</code> unaffected.
+     * {@code b[off]} through {@code b[off+}<i>k</i>{@code -1]},
+     * leaving elements {@code b[off+}<i>k</i>{@code ]} through
+     * {@code b[off+len-1]} unaffected.
      *
-     * <p> In every case, elements <code>b[0]</code> through
-     * <code>b[off-1]</code> and elements <code>b[off+len]</code> through
-     * <code>b[b.length-1]</code> are unaffected.
+     * <p> In every case, elements {@code b[0]} through
+     * {@code b[off-1]} and elements {@code b[off+len]} through
+     * {@code b[b.length-1]} are unaffected.
      *
-     * <p> The <code>read(b,</code> <code>off,</code> <code>len)</code> method
-     * for class <code>InputStream</code> simply calls the method
-     * <code>read()</code> repeatedly. If the first such call results in an
-     * <code>IOException</code>, that exception is returned from the call to
-     * the <code>read(b,</code> <code>off,</code> <code>len)</code> method.  If
-     * any subsequent call to <code>read()</code> results in a
-     * <code>IOException</code>, the exception is caught and treated as if it
+     * <p> The {@code read(b, off, len)} method
+     * for class {@code InputStream} simply calls the method
+     * {@code read()} repeatedly. If the first such call results in an
+     * {@code IOException}, that exception is returned from the call to
+     * the {@code read(b,} {@code off,} {@code len)} method.  If
+     * any subsequent call to {@code read()} results in a
+     * {@code IOException}, the exception is caught and treated as if it
      * were end of file; the bytes read up to that point are stored into
-     * <code>b</code> and the number of bytes read before the exception
+     * {@code b} and the number of bytes read before the exception
      * occurred is returned. The default implementation of this method blocks
-     * until the requested amount of input data <code>len</code> has been read,
+     * until the requested amount of input data {@code len} has been read,
      * end of file is detected, or an exception is thrown. Subclasses are
      * encouraged to provide a more efficient implementation of this method.
      *
      * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset in array <code>b</code>
+     * @param      off   the start offset in array {@code b}
      *                   at which the data is written.
      * @param      len   the maximum number of bytes to read.
      * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
+     *             {@code -1} if there is no more data because the end of
      *             the stream has been reached.
      * @throws     IOException If the first byte cannot be read for any reason
      *             other than end of file, or if the input stream has been closed,
      *             or if some other I/O error occurs.
-     * @throws     NullPointerException If <code>b</code> is <code>null</code>.
-     * @throws     IndexOutOfBoundsException If <code>off</code> is negative,
-     *             <code>len</code> is negative, or <code>len</code> is greater than
-     *             <code>b.length - off</code>
+     * @throws     NullPointerException If {@code b} is {@code null}.
+     * @throws     IndexOutOfBoundsException If {@code off} is negative,
+     *             {@code len} is negative, or {@code len} is greater than
+     *             {@code b.length - off}
      * @see        java.io.InputStream#read()
      */
     public int read(byte b[], int off, int len) throws IOException {
@@ -509,18 +509,18 @@
     }
 
     /**
-     * Skips over and discards <code>n</code> bytes of data from this input
-     * stream. The <code>skip</code> method may, for a variety of reasons, end
-     * up skipping over some smaller number of bytes, possibly <code>0</code>.
+     * Skips over and discards {@code n} bytes of data from this input
+     * stream. The {@code skip} method may, for a variety of reasons, end
+     * up skipping over some smaller number of bytes, possibly {@code 0}.
      * This may result from any of a number of conditions; reaching end of file
-     * before <code>n</code> bytes have been skipped is only one possibility.
+     * before {@code n} bytes have been skipped is only one possibility.
      * The actual number of bytes skipped is returned. If {@code n} is
      * negative, the {@code skip} method for class {@code InputStream} always
      * returns 0, and no bytes are skipped. Subclasses may handle the negative
      * value differently.
      *
-     * <p> The <code>skip</code> method implementation of this class creates a
-     * byte array and then repeatedly reads into it until <code>n</code> bytes
+     * <p> The {@code skip} method implementation of this class creates a
+     * byte array and then repeatedly reads into it until {@code n} bytes
      * have been read or the end of the stream has been reached. Subclasses are
      * encouraged to provide a more efficient implementation of this method.
      * For instance, the implementation may depend on the ability to seek.
@@ -644,7 +644,7 @@
      * Closes this input stream and releases any system resources associated
      * with the stream.
      *
-     * <p> The <code>close</code> method of <code>InputStream</code> does
+     * <p> The {@code close} method of {@code InputStream} does
      * nothing.
      *
      * @throws     IOException  if an I/O error occurs.
@@ -653,24 +653,24 @@
 
     /**
      * Marks the current position in this input stream. A subsequent call to
-     * the <code>reset</code> method repositions this stream at the last marked
+     * the {@code reset} method repositions this stream at the last marked
      * position so that subsequent reads re-read the same bytes.
      *
-     * <p> The <code>readlimit</code> arguments tells this input stream to
+     * <p> The {@code readlimit} arguments tells this input stream to
      * allow that many bytes to be read before the mark position gets
      * invalidated.
      *
-     * <p> The general contract of <code>mark</code> is that, if the method
-     * <code>markSupported</code> returns <code>true</code>, the stream somehow
-     * remembers all the bytes read after the call to <code>mark</code> and
+     * <p> The general contract of {@code mark} is that, if the method
+     * {@code markSupported} returns {@code true}, the stream somehow
+     * remembers all the bytes read after the call to {@code mark} and
      * stands ready to supply those same bytes again if and whenever the method
-     * <code>reset</code> is called.  However, the stream is not required to
-     * remember any data at all if more than <code>readlimit</code> bytes are
-     * read from the stream before <code>reset</code> is called.
+     * {@code reset} is called.  However, the stream is not required to
+     * remember any data at all if more than {@code readlimit} bytes are
+     * read from the stream before {@code reset} is called.
      *
      * <p> Marking a closed stream should not have any effect on the stream.
      *
-     * <p> The <code>mark</code> method of <code>InputStream</code> does
+     * <p> The {@code mark} method of {@code InputStream} does
      * nothing.
      *
      * @param   readlimit   the maximum limit of bytes that can be read before
@@ -681,42 +681,42 @@
 
     /**
      * Repositions this stream to the position at the time the
-     * <code>mark</code> method was last called on this input stream.
+     * {@code mark} method was last called on this input stream.
      *
-     * <p> The general contract of <code>reset</code> is:
+     * <p> The general contract of {@code reset} is:
      *
      * <ul>
-     * <li> If the method <code>markSupported</code> returns
-     * <code>true</code>, then:
+     * <li> If the method {@code markSupported} returns
+     * {@code true}, then:
      *
-     *     <ul><li> If the method <code>mark</code> has not been called since
+     *     <ul><li> If the method {@code mark} has not been called since
      *     the stream was created, or the number of bytes read from the stream
-     *     since <code>mark</code> was last called is larger than the argument
-     *     to <code>mark</code> at that last call, then an
-     *     <code>IOException</code> might be thrown.
+     *     since {@code mark} was last called is larger than the argument
+     *     to {@code mark} at that last call, then an
+     *     {@code IOException} might be thrown.
      *
-     *     <li> If such an <code>IOException</code> is not thrown, then the
+     *     <li> If such an {@code IOException} is not thrown, then the
      *     stream is reset to a state such that all the bytes read since the
-     *     most recent call to <code>mark</code> (or since the start of the
-     *     file, if <code>mark</code> has not been called) will be resupplied
-     *     to subsequent callers of the <code>read</code> method, followed by
+     *     most recent call to {@code mark} (or since the start of the
+     *     file, if {@code mark} has not been called) will be resupplied
+     *     to subsequent callers of the {@code read} method, followed by
      *     any bytes that otherwise would have been the next input data as of
-     *     the time of the call to <code>reset</code>. </ul>
+     *     the time of the call to {@code reset}. </ul>
      *
-     * <li> If the method <code>markSupported</code> returns
-     * <code>false</code>, then:
+     * <li> If the method {@code markSupported} returns
+     * {@code false}, then:
      *
-     *     <ul><li> The call to <code>reset</code> may throw an
-     *     <code>IOException</code>.
+     *     <ul><li> The call to {@code reset} may throw an
+     *     {@code IOException}.
      *
-     *     <li> If an <code>IOException</code> is not thrown, then the stream
+     *     <li> If an {@code IOException} is not thrown, then the stream
      *     is reset to a fixed state that depends on the particular type of the
      *     input stream and how it was created. The bytes that will be supplied
-     *     to subsequent callers of the <code>read</code> method depend on the
+     *     to subsequent callers of the {@code read} method depend on the
      *     particular type of the input stream. </ul></ul>
      *
-     * <p>The method <code>reset</code> for class <code>InputStream</code>
-     * does nothing except throw an <code>IOException</code>.
+     * <p>The method {@code reset} for class {@code InputStream}
+     * does nothing except throw an {@code IOException}.
      *
      * @throws  IOException  if this stream has not been marked or if the
      *          mark has been invalidated.
@@ -728,14 +728,14 @@
     }
 
     /**
-     * Tests if this input stream supports the <code>mark</code> and
-     * <code>reset</code> methods. Whether or not <code>mark</code> and
-     * <code>reset</code> are supported is an invariant property of a
-     * particular input stream instance. The <code>markSupported</code> method
-     * of <code>InputStream</code> returns <code>false</code>.
+     * Tests if this input stream supports the {@code mark} and
+     * {@code reset} methods. Whether or not {@code mark} and
+     * {@code reset} are supported is an invariant property of a
+     * particular input stream instance. The {@code markSupported} method
+     * of {@code InputStream} returns {@code false}.
      *
-     * @return  <code>true</code> if this stream instance supports the mark
-     *          and reset methods; <code>false</code> otherwise.
+     * @return  {@code true} if this stream instance supports the mark
+     *          and reset methods; {@code false} otherwise.
      * @see     java.io.InputStream#mark(int)
      * @see     java.io.InputStream#reset()
      */
--- a/src/java.base/share/classes/java/io/InputStreamReader.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/InputStreamReader.java	Tue Sep 24 09:43:43 2019 +0100
@@ -141,11 +141,11 @@
      * <p> If this instance was created with the {@link
      * #InputStreamReader(InputStream, String)} constructor then the returned
      * name, being unique for the encoding, may differ from the name passed to
-     * the constructor. This method will return <code>null</code> if the
+     * the constructor. This method will return {@code null} if the
      * stream has been closed.
      * </p>
      * @return The historical name of this encoding, or
-     *         <code>null</code> if the stream has been closed
+     *         {@code null} if the stream has been closed
      *
      * @see java.nio.charset.Charset
      *
--- a/src/java.base/share/classes/java/io/InterruptedIOException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/InterruptedIOException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -27,7 +27,7 @@
 
 /**
  * Signals that an I/O operation has been interrupted. An
- * <code>InterruptedIOException</code> is thrown to indicate that an
+ * {@code InterruptedIOException} is thrown to indicate that an
  * input or output transfer has been terminated because the thread
  * performing it was interrupted. The field {@link #bytesTransferred}
  * indicates how many bytes were successfully transferred before
@@ -45,19 +45,19 @@
     private static final long serialVersionUID = 4020568460727500567L;
 
     /**
-     * Constructs an <code>InterruptedIOException</code> with
-     * <code>null</code> as its error detail message.
+     * Constructs an {@code InterruptedIOException} with
+     * {@code null} as its error detail message.
      */
     public InterruptedIOException() {
         super();
     }
 
     /**
-     * Constructs an <code>InterruptedIOException</code> with the
-     * specified detail message. The string <code>s</code> can be
+     * Constructs an {@code InterruptedIOException} with the
+     * specified detail message. The string {@code s} can be
      * retrieved later by the
      * <code>{@link java.lang.Throwable#getMessage}</code>
-     * method of class <code>java.lang.Throwable</code>.
+     * method of class {@code java.lang.Throwable}.
      *
      * @param   s   the detail message.
      */
--- a/src/java.base/share/classes/java/io/InvalidObjectException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/InvalidObjectException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -41,7 +41,7 @@
     private static final long serialVersionUID = 3233174318281839583L;
 
     /**
-     * Constructs an <code>InvalidObjectException</code>.
+     * Constructs an {@code InvalidObjectException}.
      * @param reason Detailed message explaining the reason for the failure.
      *
      * @see ObjectInputValidation
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -74,7 +74,7 @@
  * <p>Only objects that support the java.io.Serializable or
  * java.io.Externalizable interface can be read from streams.
  *
- * <p>The method <code>readObject</code> is used to read an object from the
+ * <p>The method {@code readObject} is used to read an object from the
  * stream.  Java's safe casting should be used to get the desired type.  In
  * Java, strings and arrays are objects and are treated as objects during
  * serialization. When read they need to be cast to the expected type.
@@ -157,7 +157,7 @@
  * throw OptionalDataExceptions with eof set to true, bytewise reads will
  * return -1, and primitive reads will throw EOFExceptions.  Note that this
  * behavior does not hold for streams written with the old
- * <code>ObjectStreamConstants.PROTOCOL_VERSION_1</code> protocol, in which the
+ * {@code ObjectStreamConstants.PROTOCOL_VERSION_1} protocol, in which the
  * end of data written by writeExternal methods is not demarcated, and hence
  * cannot be detected.
  *
@@ -208,7 +208,7 @@
  * solely of its name; field values of the constant are not transmitted.  To
  * deserialize an enum constant, ObjectInputStream reads the constant name from
  * the stream; the deserialized constant is then obtained by calling the static
- * method <code>Enum.valueOf(Class, String)</code> with the enum constant's
+ * method {@code Enum.valueOf(Class, String)} with the enum constant's
  * base type and the received constant name as arguments.  Like other
  * serializable or externalizable objects, enum constants can function as the
  * targets of back references appearing subsequently in the serialization
@@ -335,7 +335,7 @@
      * @throws  IOException if an I/O error occurs while reading stream header
      * @throws  SecurityException if untrusted subclass illegally overrides
      *          security-sensitive methods
-     * @throws  NullPointerException if <code>in</code> is <code>null</code>
+     * @throws  NullPointerException if {@code in} is {@code null}
      * @see     ObjectInputStream#ObjectInputStream()
      * @see     ObjectInputStream#readFields()
      * @see     ObjectOutputStream#ObjectOutputStream(OutputStream)
@@ -360,12 +360,12 @@
      * {@linkplain ObjectInputFilter.Config#getSerialFilter() the system-wide filter}.
      *
      * <p>If there is a security manager installed, this method first calls the
-     * security manager's <code>checkPermission</code> method with the
-     * <code>SerializablePermission("enableSubclassImplementation")</code>
+     * security manager's {@code checkPermission} method with the
+     * {@code SerializablePermission("enableSubclassImplementation")}
      * permission to ensure it's ok to enable subclassing.
      *
      * @throws  SecurityException if a security manager exists and its
-     *          <code>checkPermission</code> method denies enabling
+     *          {@code checkPermission} method denies enabling
      *          subclassing.
      * @throws  IOException if an I/O error occurs while creating this stream
      * @see SecurityManager#checkPermission
@@ -587,7 +587,7 @@
      * Reads the persistent fields from the stream and makes them available by
      * name.
      *
-     * @return  the <code>GetField</code> object representing the persistent
+     * @return  the {@code GetField} object representing the persistent
      *          fields of the object being deserialized
      * @throws  ClassNotFoundException if the class of a serialized object
      *          could not be found.
@@ -651,36 +651,36 @@
      * description.  Subclasses may implement this method to allow classes to
      * be fetched from an alternate source.
      *
-     * <p>The corresponding method in <code>ObjectOutputStream</code> is
-     * <code>annotateClass</code>.  This method will be invoked only once for
+     * <p>The corresponding method in {@code ObjectOutputStream} is
+     * {@code annotateClass}.  This method will be invoked only once for
      * each unique class in the stream.  This method can be implemented by
      * subclasses to use an alternate loading mechanism but must return a
-     * <code>Class</code> object. Once returned, if the class is not an array
+     * {@code Class} object. Once returned, if the class is not an array
      * class, its serialVersionUID is compared to the serialVersionUID of the
      * serialized class, and if there is a mismatch, the deserialization fails
      * and an {@link InvalidClassException} is thrown.
      *
      * <p>The default implementation of this method in
-     * <code>ObjectInputStream</code> returns the result of calling
+     * {@code ObjectInputStream} returns the result of calling
      * <pre>
      *     Class.forName(desc.getName(), false, loader)
      * </pre>
-     * where <code>loader</code> is the first class loader on the current
+     * where {@code loader} is the first class loader on the current
      * thread's stack (starting from the currently executing method) that is
      * neither the {@linkplain ClassLoader#getPlatformClassLoader() platform
-     * class loader} nor its ancestor; otherwise, <code>loader</code> is the
+     * class loader} nor its ancestor; otherwise, {@code loader} is the
      * <em>platform class loader</em>. If this call results in a
-     * <code>ClassNotFoundException</code> and the name of the passed
-     * <code>ObjectStreamClass</code> instance is the Java language keyword
-     * for a primitive type or void, then the <code>Class</code> object
+     * {@code ClassNotFoundException} and the name of the passed
+     * {@code ObjectStreamClass} instance is the Java language keyword
+     * for a primitive type or void, then the {@code Class} object
      * representing that primitive type or void will be returned
-     * (e.g., an <code>ObjectStreamClass</code> with the name
-     * <code>"int"</code> will be resolved to <code>Integer.TYPE</code>).
-     * Otherwise, the <code>ClassNotFoundException</code> will be thrown to
+     * (e.g., an {@code ObjectStreamClass} with the name
+     * {@code "int"} will be resolved to {@code Integer.TYPE}).
+     * Otherwise, the {@code ClassNotFoundException} will be thrown to
      * the caller of this method.
      *
-     * @param   desc an instance of class <code>ObjectStreamClass</code>
-     * @return  a <code>Class</code> object corresponding to <code>desc</code>
+     * @param   desc an instance of class {@code ObjectStreamClass}
+     * @return  a {@code Class} object corresponding to {@code desc}
      * @throws  IOException any of the usual Input/Output exceptions.
      * @throws  ClassNotFoundException if class of a serialized object cannot
      *          be found.
@@ -711,43 +711,43 @@
      * <p>This method is called exactly once for each unique proxy class
      * descriptor in the stream.
      *
-     * <p>The corresponding method in <code>ObjectOutputStream</code> is
-     * <code>annotateProxyClass</code>.  For a given subclass of
-     * <code>ObjectInputStream</code> that overrides this method, the
-     * <code>annotateProxyClass</code> method in the corresponding subclass of
-     * <code>ObjectOutputStream</code> must write any data or objects read by
+     * <p>The corresponding method in {@code ObjectOutputStream} is
+     * {@code annotateProxyClass}.  For a given subclass of
+     * {@code ObjectInputStream} that overrides this method, the
+     * {@code annotateProxyClass} method in the corresponding subclass of
+     * {@code ObjectOutputStream} must write any data or objects read by
      * this method.
      *
      * <p>The default implementation of this method in
-     * <code>ObjectInputStream</code> returns the result of calling
-     * <code>Proxy.getProxyClass</code> with the list of <code>Class</code>
-     * objects for the interfaces that are named in the <code>interfaces</code>
-     * parameter.  The <code>Class</code> object for each interface name
-     * <code>i</code> is the value returned by calling
+     * {@code ObjectInputStream} returns the result of calling
+     * {@code Proxy.getProxyClass} with the list of {@code Class}
+     * objects for the interfaces that are named in the {@code interfaces}
+     * parameter.  The {@code Class} object for each interface name
+     * {@code i} is the value returned by calling
      * <pre>
      *     Class.forName(i, false, loader)
      * </pre>
-     * where <code>loader</code> is the first class loader on the current
+     * where {@code loader} is the first class loader on the current
      * thread's stack (starting from the currently executing method) that is
      * neither the {@linkplain ClassLoader#getPlatformClassLoader() platform
-     * class loader} nor its ancestor; otherwise, <code>loader</code> is the
+     * class loader} nor its ancestor; otherwise, {@code loader} is the
      * <em>platform class loader</em>.
      * Unless any of the resolved interfaces are non-public, this same value
-     * of <code>loader</code> is also the class loader passed to
-     * <code>Proxy.getProxyClass</code>; if non-public interfaces are present,
+     * of {@code loader} is also the class loader passed to
+     * {@code Proxy.getProxyClass}; if non-public interfaces are present,
      * their class loader is passed instead (if more than one non-public
      * interface class loader is encountered, an
-     * <code>IllegalAccessError</code> is thrown).
-     * If <code>Proxy.getProxyClass</code> throws an
-     * <code>IllegalArgumentException</code>, <code>resolveProxyClass</code>
-     * will throw a <code>ClassNotFoundException</code> containing the
-     * <code>IllegalArgumentException</code>.
+     * {@code IllegalAccessError} is thrown).
+     * If {@code Proxy.getProxyClass} throws an
+     * {@code IllegalArgumentException}, {@code resolveProxyClass}
+     * will throw a {@code ClassNotFoundException} containing the
+     * {@code IllegalArgumentException}.
      *
      * @param interfaces the list of interface names that were
      *                deserialized in the proxy class descriptor
      * @return  a proxy class for the specified interfaces
      * @throws        IOException any exception thrown by the underlying
-     *                <code>InputStream</code>
+     *                {@code InputStream}
      * @throws        ClassNotFoundException if the proxy class or any of the
      *                named interfaces could not be found
      * @see ObjectOutputStream#annotateProxyClass(Class)
@@ -863,7 +863,7 @@
      * and version number.
      *
      * @throws  IOException if there are I/O errors while reading from the
-     *          underlying <code>InputStream</code>
+     *          underlying {@code InputStream}
      * @throws  StreamCorruptedException if control information in the stream
      *          is inconsistent
      */
@@ -884,7 +884,7 @@
      * item in the serialization stream.  Subclasses of ObjectInputStream may
      * override this method to read in class descriptors that have been written
      * in non-standard formats (by subclasses of ObjectOutputStream which have
-     * overridden the <code>writeClassDescriptor</code> method).  By default,
+     * overridden the {@code writeClassDescriptor} method).  By default,
      * this method reads class descriptors according to the format defined in
      * the Object Serialization specification.
      *
@@ -946,7 +946,7 @@
      *
      * @return  the number of available bytes.
      * @throws  IOException if there are I/O errors while reading from the
-     *          underlying <code>InputStream</code>
+     *          underlying {@code InputStream}
      */
     public int available() throws IOException {
         return bin.available();
@@ -1129,7 +1129,7 @@
      *
      * @return  a String copy of the line.
      * @throws  IOException if there are I/O errors while reading from the
-     *          underlying <code>InputStream</code>
+     *          underlying {@code InputStream}
      * @deprecated This method does not properly convert bytes to characters.
      *          see DataInputStream for the details and alternatives.
      */
@@ -1145,7 +1145,7 @@
      *
      * @return  the String.
      * @throws  IOException if there are I/O errors while reading from the
-     *          underlying <code>InputStream</code>
+     *          underlying {@code InputStream}
      * @throws  UTFDataFormatException if read bytes do not represent a valid
      *          modified UTF-8 encoding of a string
      */
@@ -1340,8 +1340,8 @@
          * @param  name the name of the field
          * @return true, if and only if the named field is defaulted
          * @throws IOException if there are I/O errors while reading from
-         *         the underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if <code>name</code> does not
+         *         the underlying {@code InputStream}
+         * @throws IllegalArgumentException if {@code name} does not
          *         correspond to a serializable field
          */
         public abstract boolean defaulted(String name) throws IOException;
@@ -1350,12 +1350,12 @@
          * Get the value of the named boolean field from the persistent field.
          *
          * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
+         * @param  val the default value to use if {@code name} does not
          *         have a value
-         * @return the value of the named <code>boolean</code> field
+         * @return the value of the named {@code boolean} field
          * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         underlying {@code InputStream}
+         * @throws IllegalArgumentException if type of {@code name} is
          *         not serializable or if the field type is incorrect
          */
         public abstract boolean get(String name, boolean val)
@@ -1365,12 +1365,12 @@
          * Get the value of the named byte field from the persistent field.
          *
          * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
+         * @param  val the default value to use if {@code name} does not
          *         have a value
-         * @return the value of the named <code>byte</code> field
+         * @return the value of the named {@code byte} field
          * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         underlying {@code InputStream}
+         * @throws IllegalArgumentException if type of {@code name} is
          *         not serializable or if the field type is incorrect
          */
         public abstract byte get(String name, byte val) throws IOException;
@@ -1379,12 +1379,12 @@
          * Get the value of the named char field from the persistent field.
          *
          * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
+         * @param  val the default value to use if {@code name} does not
          *         have a value
-         * @return the value of the named <code>char</code> field
+         * @return the value of the named {@code char} field
          * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         underlying {@code InputStream}
+         * @throws IllegalArgumentException if type of {@code name} is
          *         not serializable or if the field type is incorrect
          */
         public abstract char get(String name, char val) throws IOException;
@@ -1393,12 +1393,12 @@
          * Get the value of the named short field from the persistent field.
          *
          * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
+         * @param  val the default value to use if {@code name} does not
          *         have a value
-         * @return the value of the named <code>short</code> field
+         * @return the value of the named {@code short} field
          * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         underlying {@code InputStream}
+         * @throws IllegalArgumentException if type of {@code name} is
          *         not serializable or if the field type is incorrect
          */
         public abstract short get(String name, short val) throws IOException;
@@ -1407,12 +1407,12 @@
          * Get the value of the named int field from the persistent field.
          *
          * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
+         * @param  val the default value to use if {@code name} does not
          *         have a value
-         * @return the value of the named <code>int</code> field
+         * @return the value of the named {@code int} field
          * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         underlying {@code InputStream}
+         * @throws IllegalArgumentException if type of {@code name} is
          *         not serializable or if the field type is incorrect
          */
         public abstract int get(String name, int val) throws IOException;
@@ -1421,12 +1421,12 @@
          * Get the value of the named long field from the persistent field.
          *
          * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
+         * @param  val the default value to use if {@code name} does not
          *         have a value
-         * @return the value of the named <code>long</code> field
+         * @return the value of the named {@code long} field
          * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         underlying {@code InputStream}
+         * @throws IllegalArgumentException if type of {@code name} is
          *         not serializable or if the field type is incorrect
          */
         public abstract long get(String name, long val) throws IOException;
@@ -1435,12 +1435,12 @@
          * Get the value of the named float field from the persistent field.
          *
          * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
+         * @param  val the default value to use if {@code name} does not
          *         have a value
-         * @return the value of the named <code>float</code> field
+         * @return the value of the named {@code float} field
          * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         underlying {@code InputStream}
+         * @throws IllegalArgumentException if type of {@code name} is
          *         not serializable or if the field type is incorrect
          */
         public abstract float get(String name, float val) throws IOException;
@@ -1449,12 +1449,12 @@
          * Get the value of the named double field from the persistent field.
          *
          * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
+         * @param  val the default value to use if {@code name} does not
          *         have a value
-         * @return the value of the named <code>double</code> field
+         * @return the value of the named {@code double} field
          * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         underlying {@code InputStream}
+         * @throws IllegalArgumentException if type of {@code name} is
          *         not serializable or if the field type is incorrect
          */
         public abstract double get(String name, double val) throws IOException;
@@ -1463,12 +1463,12 @@
          * Get the value of the named Object field from the persistent field.
          *
          * @param  name the name of the field
-         * @param  val the default value to use if <code>name</code> does not
+         * @param  val the default value to use if {@code name} does not
          *         have a value
-         * @return the value of the named <code>Object</code> field
+         * @return the value of the named {@code Object} field
          * @throws IOException if there are I/O errors while reading from the
-         *         underlying <code>InputStream</code>
-         * @throws IllegalArgumentException if type of <code>name</code> is
+         *         underlying {@code InputStream}
+         * @throws IllegalArgumentException if type of {@code name} is
          *         not serializable or if the field type is incorrect
          */
         public abstract Object get(String name, Object val) throws IOException;
--- a/src/java.base/share/classes/java/io/ObjectOutputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/ObjectOutputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -232,7 +232,7 @@
      * @throws  IOException if an I/O error occurs while writing stream header
      * @throws  SecurityException if untrusted subclass illegally overrides
      *          security-sensitive methods
-     * @throws  NullPointerException if <code>out</code> is <code>null</code>
+     * @throws  NullPointerException if {@code out} is {@code null}
      * @since   1.4
      * @see     ObjectOutputStream#ObjectOutputStream()
      * @see     ObjectOutputStream#putFields()
@@ -259,12 +259,12 @@
      * this implementation of ObjectOutputStream.
      *
      * <p>If there is a security manager installed, this method first calls the
-     * security manager's <code>checkPermission</code> method with a
-     * <code>SerializablePermission("enableSubclassImplementation")</code>
+     * security manager's {@code checkPermission} method with a
+     * {@code SerializablePermission("enableSubclassImplementation")}
      * permission to ensure it's ok to enable subclassing.
      *
      * @throws  SecurityException if a security manager exists and its
-     *          <code>checkPermission</code> method denies enabling
+     *          {@code checkPermission} method denies enabling
      *          subclassing.
      * @throws  IOException if an I/O error occurs while creating this stream
      * @see SecurityManager#checkPermission
@@ -429,7 +429,7 @@
      * called otherwise.
      *
      * @throws  IOException if I/O errors occur while writing to the underlying
-     *          <code>OutputStream</code>
+     *          {@code OutputStream}
      */
     public void defaultWriteObject() throws IOException {
         SerialCallbackContext ctx = curContext;
@@ -529,18 +529,18 @@
      *
      * <p>This method is called exactly once for each unique proxy class
      * descriptor in the stream.  The default implementation of this method in
-     * <code>ObjectOutputStream</code> does nothing.
+     * {@code ObjectOutputStream} does nothing.
      *
-     * <p>The corresponding method in <code>ObjectInputStream</code> is
-     * <code>resolveProxyClass</code>.  For a given subclass of
-     * <code>ObjectOutputStream</code> that overrides this method, the
-     * <code>resolveProxyClass</code> method in the corresponding subclass of
-     * <code>ObjectInputStream</code> must read any data or objects written by
-     * <code>annotateProxyClass</code>.
+     * <p>The corresponding method in {@code ObjectInputStream} is
+     * {@code resolveProxyClass}.  For a given subclass of
+     * {@code ObjectOutputStream} that overrides this method, the
+     * {@code resolveProxyClass} method in the corresponding subclass of
+     * {@code ObjectInputStream} must read any data or objects written by
+     * {@code annotateProxyClass}.
      *
      * @param   cl the proxy class to annotate custom data for
      * @throws  IOException any exception thrown by the underlying
-     *          <code>OutputStream</code>
+     *          {@code OutputStream}
      * @see ObjectInputStream#resolveProxyClass(String[])
      * @since   1.3
      */
@@ -646,16 +646,16 @@
      * stream.  Subclasses of ObjectOutputStream may override this method to
      * customize the way in which class descriptors are written to the
      * serialization stream.  The corresponding method in ObjectInputStream,
-     * <code>readClassDescriptor</code>, should then be overridden to
+     * {@code readClassDescriptor}, should then be overridden to
      * reconstitute the class descriptor from its custom stream representation.
      * By default, this method writes class descriptors according to the format
      * defined in the Object Serialization specification.
      *
      * <p>Note that this method will only be called if the ObjectOutputStream
      * is not using the old serialization stream format (set by calling
-     * ObjectOutputStream's <code>useProtocolVersion</code> method).  If this
+     * ObjectOutputStream's {@code useProtocolVersion} method).  If this
      * serialization stream is using the old format
-     * (<code>PROTOCOL_VERSION_1</code>), the class descriptor will be written
+     * ({@code PROTOCOL_VERSION_1}), the class descriptor will be written
      * internally in a manner that cannot be overridden or customized.
      *
      * @param   desc class descriptor to write to the stream
@@ -889,10 +889,10 @@
          *
          * @param  name the name of the serializable field
          * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
+         * @throws IllegalArgumentException if {@code name} does not
          * match the name of a serializable field for the class whose fields
          * are being written, or if the type of the named field is not
-         * <code>boolean</code>
+         * {@code boolean}
          */
         public abstract void put(String name, boolean val);
 
@@ -901,10 +901,10 @@
          *
          * @param  name the name of the serializable field
          * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
+         * @throws IllegalArgumentException if {@code name} does not
          * match the name of a serializable field for the class whose fields
          * are being written, or if the type of the named field is not
-         * <code>byte</code>
+         * {@code byte}
          */
         public abstract void put(String name, byte val);
 
@@ -913,10 +913,10 @@
          *
          * @param  name the name of the serializable field
          * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
+         * @throws IllegalArgumentException if {@code name} does not
          * match the name of a serializable field for the class whose fields
          * are being written, or if the type of the named field is not
-         * <code>char</code>
+         * {@code char}
          */
         public abstract void put(String name, char val);
 
@@ -925,10 +925,10 @@
          *
          * @param  name the name of the serializable field
          * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
+         * @throws IllegalArgumentException if {@code name} does not
          * match the name of a serializable field for the class whose fields
          * are being written, or if the type of the named field is not
-         * <code>short</code>
+         * {@code short}
          */
         public abstract void put(String name, short val);
 
@@ -937,10 +937,10 @@
          *
          * @param  name the name of the serializable field
          * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
+         * @throws IllegalArgumentException if {@code name} does not
          * match the name of a serializable field for the class whose fields
          * are being written, or if the type of the named field is not
-         * <code>int</code>
+         * {@code int}
          */
         public abstract void put(String name, int val);
 
@@ -949,10 +949,10 @@
          *
          * @param  name the name of the serializable field
          * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
+         * @throws IllegalArgumentException if {@code name} does not
          * match the name of a serializable field for the class whose fields
          * are being written, or if the type of the named field is not
-         * <code>long</code>
+         * {@code long}
          */
         public abstract void put(String name, long val);
 
@@ -961,10 +961,10 @@
          *
          * @param  name the name of the serializable field
          * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
+         * @throws IllegalArgumentException if {@code name} does not
          * match the name of a serializable field for the class whose fields
          * are being written, or if the type of the named field is not
-         * <code>float</code>
+         * {@code float}
          */
         public abstract void put(String name, float val);
 
@@ -973,10 +973,10 @@
          *
          * @param  name the name of the serializable field
          * @param  val the value to assign to the field
-         * @throws IllegalArgumentException if <code>name</code> does not
+         * @throws IllegalArgumentException if {@code name} does not
          * match the name of a serializable field for the class whose fields
          * are being written, or if the type of the named field is not
-         * <code>double</code>
+         * {@code double}
          */
         public abstract void put(String name, double val);
 
@@ -985,8 +985,8 @@
          *
          * @param  name the name of the serializable field
          * @param  val the value to assign to the field
-         *         (which may be <code>null</code>)
-         * @throws IllegalArgumentException if <code>name</code> does not
+         *         (which may be {@code null})
+         * @throws IllegalArgumentException if {@code name} does not
          * match the name of a serializable field for the class whose fields
          * are being written, or if the type of the named field is not a
          * reference type
@@ -996,18 +996,18 @@
         /**
          * Write the data and fields to the specified ObjectOutput stream,
          * which must be the same stream that produced this
-         * <code>PutField</code> object.
+         * {@code PutField} object.
          *
          * @param  out the stream to write the data and fields to
          * @throws IOException if I/O errors occur while writing to the
          *         underlying stream
          * @throws IllegalArgumentException if the specified stream is not
-         *         the same stream that produced this <code>PutField</code>
+         *         the same stream that produced this {@code PutField}
          *         object
          * @deprecated This method does not write the values contained by this
-         *         <code>PutField</code> object in a proper format, and may
+         *         {@code PutField} object in a proper format, and may
          *         result in corruption of the serialization stream.  The
-         *         correct way to write <code>PutField</code> data is by
+         *         correct way to write {@code PutField} data is by
          *         calling the {@link java.io.ObjectOutputStream#writeFields()}
          *         method.
          */
--- a/src/java.base/share/classes/java/io/ObjectStreamClass.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java	Tue Sep 24 09:43:43 2019 +0100
@@ -276,7 +276,7 @@
      * Return the class in the local VM that this version is mapped to.  Null
      * is returned if there is no corresponding local class.
      *
-     * @return  the <code>Class</code> instance that this descriptor represents
+     * @return  the {@code Class} instance that this descriptor represents
      */
     @CallerSensitive
     public Class<?> forClass() {
--- a/src/java.base/share/classes/java/io/ObjectStreamField.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/ObjectStreamField.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,10 +60,10 @@
 
     /**
      * Create a Serializable field with the specified type.  This field should
-     * be documented with a <code>serialField</code> tag.
+     * be documented with a {@code serialField} tag.
      *
      * @param   name the name of the serializable field
-     * @param   type the <code>Class</code> object of the serializable field
+     * @param   type the {@code Class} object of the serializable field
      */
     public ObjectStreamField(String name, Class<?> type) {
         this(name, type, false);
@@ -197,7 +197,7 @@
     /**
      * Get the name of this field.
      *
-     * @return  a <code>String</code> representing the name of the serializable
+     * @return  a {@code String} representing the name of the serializable
      *          field
      */
     public String getName() {
@@ -206,12 +206,12 @@
 
     /**
      * Get the type of the field.  If the type is non-primitive and this
-     * <code>ObjectStreamField</code> was obtained from a deserialized {@link
-     * ObjectStreamClass} instance, then <code>Object.class</code> is returned.
-     * Otherwise, the <code>Class</code> object for the type of the field is
+     * {@code ObjectStreamField} was obtained from a deserialized {@link
+     * ObjectStreamClass} instance, then {@code Object.class} is returned.
+     * Otherwise, the {@code Class} object for the type of the field is
      * returned.
      *
-     * @return  a <code>Class</code> object representing the type of the
+     * @return  a {@code Class} object representing the type of the
      *          serializable field
      */
     @CallerSensitive
@@ -303,7 +303,7 @@
     }
 
     /**
-     * Compare this field with another <code>ObjectStreamField</code>.  Return
+     * Compare this field with another {@code ObjectStreamField}.  Return
      * -1 if this is smaller, 0 if equal, 1 if greater.  Types that are
      * primitives are "smaller" than object types.  If equal, the field names
      * are compared.
--- a/src/java.base/share/classes/java/io/OptionalDataException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/OptionalDataException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -51,7 +51,7 @@
     private static final long serialVersionUID = -8011121865681257820L;
 
     /*
-     * Create an <code>OptionalDataException</code> with a length.
+     * Create an {@code OptionalDataException} with a length.
      */
     OptionalDataException(int len) {
         eof = false;
@@ -59,7 +59,7 @@
     }
 
     /*
-     * Create an <code>OptionalDataException</code> signifying no
+     * Create an {@code OptionalDataException} signifying no
      * more primitive data is available.
      */
     OptionalDataException(boolean end) {
--- a/src/java.base/share/classes/java/io/OutputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/OutputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -33,7 +33,7 @@
  * and sends them to some sink.
  * <p>
  * Applications that need to define a subclass of
- * <code>OutputStream</code> must always provide at least a method
+ * {@code OutputStream} must always provide at least a method
  * that writes one byte of output.
  *
  * @author  Arthur van Hoff
@@ -98,26 +98,26 @@
 
     /**
      * Writes the specified byte to this output stream. The general
-     * contract for <code>write</code> is that one byte is written
+     * contract for {@code write} is that one byte is written
      * to the output stream. The byte to be written is the eight
-     * low-order bits of the argument <code>b</code>. The 24
-     * high-order bits of <code>b</code> are ignored.
+     * low-order bits of the argument {@code b}. The 24
+     * high-order bits of {@code b} are ignored.
      * <p>
-     * Subclasses of <code>OutputStream</code> must provide an
+     * Subclasses of {@code OutputStream} must provide an
      * implementation for this method.
      *
-     * @param      b   the <code>byte</code>.
+     * @param      b   the {@code byte}.
      * @throws     IOException  if an I/O error occurs. In particular,
-     *             an <code>IOException</code> may be thrown if the
+     *             an {@code IOException} may be thrown if the
      *             output stream has been closed.
      */
     public abstract void write(int b) throws IOException;
 
     /**
-     * Writes <code>b.length</code> bytes from the specified byte array
-     * to this output stream. The general contract for <code>write(b)</code>
+     * Writes {@code b.length} bytes from the specified byte array
+     * to this output stream. The general contract for {@code write(b)}
      * is that it should have exactly the same effect as the call
-     * <code>write(b, 0, b.length)</code>.
+     * {@code write(b, 0, b.length)}.
      *
      * @param      b   the data.
      * @throws     IOException  if an I/O error occurs.
@@ -128,31 +128,31 @@
     }
 
     /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to this output stream.
-     * The general contract for <code>write(b, off, len)</code> is that
-     * some of the bytes in the array <code>b</code> are written to the
-     * output stream in order; element <code>b[off]</code> is the first
-     * byte written and <code>b[off+len-1]</code> is the last byte written
+     * Writes {@code len} bytes from the specified byte array
+     * starting at offset {@code off} to this output stream.
+     * The general contract for {@code write(b, off, len)} is that
+     * some of the bytes in the array {@code b} are written to the
+     * output stream in order; element {@code b[off]} is the first
+     * byte written and {@code b[off+len-1]} is the last byte written
      * by this operation.
      * <p>
-     * The <code>write</code> method of <code>OutputStream</code> calls
+     * The {@code write} method of {@code OutputStream} calls
      * the write method of one argument on each of the bytes to be
      * written out. Subclasses are encouraged to override this method and
      * provide a more efficient implementation.
      * <p>
-     * If <code>b</code> is <code>null</code>, a
-     * <code>NullPointerException</code> is thrown.
+     * If {@code b} is {@code null}, a
+     * {@code NullPointerException} is thrown.
      * <p>
-     * If <code>off</code> is negative, or <code>len</code> is negative, or
-     * <code>off+len</code> is greater than the length of the array
+     * If {@code off} is negative, or {@code len} is negative, or
+     * {@code off+len} is greater than the length of the array
      * {@code b}, then an {@code IndexOutOfBoundsException} is thrown.
      *
      * @param      b     the data.
      * @param      off   the start offset in the data.
      * @param      len   the number of bytes to write.
      * @throws     IOException  if an I/O error occurs. In particular,
-     *             an <code>IOException</code> is thrown if the output
+     *             an {@code IOException} is thrown if the output
      *             stream is closed.
      */
     public void write(byte b[], int off, int len) throws IOException {
@@ -165,7 +165,7 @@
 
     /**
      * Flushes this output stream and forces any buffered output bytes
-     * to be written out. The general contract of <code>flush</code> is
+     * to be written out. The general contract of {@code flush} is
      * that calling it is an indication that, if any bytes previously
      * written have been buffered by the implementation of the output
      * stream, such bytes should immediately be written to their
@@ -177,7 +177,7 @@
      * passed to the operating system for writing; it does not guarantee that
      * they are actually written to a physical device such as a disk drive.
      * <p>
-     * The <code>flush</code> method of <code>OutputStream</code> does nothing.
+     * The {@code flush} method of {@code OutputStream} does nothing.
      *
      * @throws     IOException  if an I/O error occurs.
      */
@@ -186,11 +186,11 @@
 
     /**
      * Closes this output stream and releases any system resources
-     * associated with this stream. The general contract of <code>close</code>
+     * associated with this stream. The general contract of {@code close}
      * is that it closes the output stream. A closed stream cannot perform
      * output operations and cannot be reopened.
      * <p>
-     * The <code>close</code> method of <code>OutputStream</code> does nothing.
+     * The {@code close} method of {@code OutputStream} does nothing.
      *
      * @throws     IOException  if an I/O error occurs.
      */
--- a/src/java.base/share/classes/java/io/OutputStreamWriter.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/OutputStreamWriter.java	Tue Sep 24 09:43:43 2019 +0100
@@ -164,7 +164,7 @@
      * been closed. </p>
      *
      * @return The historical name of this encoding, or possibly
-     *         <code>null</code> if the stream has been closed
+     *         {@code null} if the stream has been closed
      *
      * @see java.nio.charset.Charset
      *
--- a/src/java.base/share/classes/java/io/PipedInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/PipedInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -30,9 +30,9 @@
  * to a piped output stream; the piped  input
  * stream then provides whatever data bytes
  * are written to the piped output  stream.
- * Typically, data is read from a <code>PipedInputStream</code>
+ * Typically, data is read from a {@code PipedInputStream}
  * object by one thread  and data is written
- * to the corresponding <code>PipedOutputStream</code>
+ * to the corresponding {@code PipedOutputStream}
  * by some  other thread. Attempting to use
  * both objects from a single thread is not
  * recommended, as it may deadlock the thread.
@@ -80,7 +80,7 @@
      * The index of the position in the circular buffer at which the
      * next byte of data will be stored when received from the connected
      * piped output stream. <code>in&lt;0</code> implies the buffer is empty,
-     * <code>in==out</code> implies the buffer is full
+     * {@code in==out} implies the buffer is full
      * @since   1.1
      */
     protected int in = -1;
@@ -93,10 +93,10 @@
     protected int out = 0;
 
     /**
-     * Creates a <code>PipedInputStream</code> so
+     * Creates a {@code PipedInputStream} so
      * that it is connected to the piped output
-     * stream <code>src</code>. Data bytes written
-     * to <code>src</code> will then be  available
+     * stream {@code src}. Data bytes written
+     * to {@code src} will then be  available
      * as input from this stream.
      *
      * @param      src   the stream to connect to.
@@ -107,11 +107,11 @@
     }
 
     /**
-     * Creates a <code>PipedInputStream</code> so that it is
+     * Creates a {@code PipedInputStream} so that it is
      * connected to the piped output stream
-     * <code>src</code> and uses the specified pipe size for
+     * {@code src} and uses the specified pipe size for
      * the pipe's buffer.
-     * Data bytes written to <code>src</code> will then
+     * Data bytes written to {@code src} will then
      * be available as input from this stream.
      *
      * @param      src   the stream to connect to.
@@ -127,24 +127,24 @@
     }
 
     /**
-     * Creates a <code>PipedInputStream</code> so
+     * Creates a {@code PipedInputStream} so
      * that it is not yet {@linkplain #connect(java.io.PipedOutputStream)
      * connected}.
      * It must be {@linkplain java.io.PipedOutputStream#connect(
      * java.io.PipedInputStream) connected} to a
-     * <code>PipedOutputStream</code> before being used.
+     * {@code PipedOutputStream} before being used.
      */
     public PipedInputStream() {
         initPipe(DEFAULT_PIPE_SIZE);
     }
 
     /**
-     * Creates a <code>PipedInputStream</code> so that it is not yet
+     * Creates a {@code PipedInputStream} so that it is not yet
      * {@linkplain #connect(java.io.PipedOutputStream) connected} and
      * uses the specified pipe size for the pipe's buffer.
      * It must be {@linkplain java.io.PipedOutputStream#connect(
      * java.io.PipedInputStream)
-     * connected} to a <code>PipedOutputStream</code> before being used.
+     * connected} to a {@code PipedOutputStream} before being used.
      *
      * @param      pipeSize the size of the pipe's buffer.
      * @throws     IllegalArgumentException if {@code pipeSize <= 0}.
@@ -163,21 +163,21 @@
 
     /**
      * Causes this piped input stream to be connected
-     * to the piped  output stream <code>src</code>.
+     * to the piped  output stream {@code src}.
      * If this object is already connected to some
-     * other piped output  stream, an <code>IOException</code>
+     * other piped output  stream, an {@code IOException}
      * is thrown.
      * <p>
-     * If <code>src</code> is an
-     * unconnected piped output stream and <code>snk</code>
+     * If {@code src} is an
+     * unconnected piped output stream and {@code snk}
      * is an unconnected piped input stream, they
      * may be connected by either the call:
      *
-     * <pre><code>snk.connect(src)</code> </pre>
+     * <pre>{@code snk.connect(src)} </pre>
      * <p>
      * or the call:
      *
-     * <pre><code>src.connect(snk)</code> </pre>
+     * <pre>{@code src.connect(snk)} </pre>
      * <p>
      * The two calls have the same effect.
      *
@@ -192,7 +192,7 @@
      * Receives a byte of data.  This method will block if no input is
      * available.
      * @param   b the byte being received
-     * @throws  IOException If the pipe is <a href="#BROKEN"> <code>broken</code></a>,
+     * @throws  IOException If the pipe is <a href="#BROKEN"> {@code broken}</a>,
      *          {@link #connect(java.io.PipedOutputStream) unconnected},
      *          closed, or if an I/O error occurs.
      * @since   1.1
@@ -288,16 +288,16 @@
 
     /**
      * Reads the next byte of data from this piped input stream. The
-     * value byte is returned as an <code>int</code> in the range
-     * <code>0</code> to <code>255</code>.
+     * value byte is returned as an {@code int} in the range
+     * {@code 0} to {@code 255}.
      * This method blocks until input data is available, the end of the
      * stream is detected, or an exception is thrown.
      *
-     * @return   the next byte of data, or <code>-1</code> if the end of the
+     * @return   the next byte of data, or {@code -1} if the end of the
      *           stream is reached.
      * @throws   IOException  if the pipe is
      *           {@link #connect(java.io.PipedOutputStream) unconnected},
-     *           <a href="#BROKEN"> <code>broken</code></a>, closed,
+     *           <a href="#BROKEN"> {@code broken}</a>, closed,
      *           or if an I/O error occurs.
      */
     public synchronized int read()  throws IOException {
@@ -341,26 +341,26 @@
     }
 
     /**
-     * Reads up to <code>len</code> bytes of data from this piped input
-     * stream into an array of bytes. Less than <code>len</code> bytes
+     * Reads up to {@code len} bytes of data from this piped input
+     * stream into an array of bytes. Less than {@code len} bytes
      * will be read if the end of the data stream is reached or if
-     * <code>len</code> exceeds the pipe's buffer size.
-     * If <code>len </code> is zero, then no bytes are read and 0 is returned;
+     * {@code len} exceeds the pipe's buffer size.
+     * If {@code len } is zero, then no bytes are read and 0 is returned;
      * otherwise, the method blocks until at least 1 byte of input is
      * available, end of the stream has been detected, or an exception is
      * thrown.
      *
      * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset in the destination array <code>b</code>
+     * @param      off   the start offset in the destination array {@code b}
      * @param      len   the maximum number of bytes read.
      * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
+     *             {@code -1} if there is no more data because the end of
      *             the stream has been reached.
-     * @throws     NullPointerException If <code>b</code> is <code>null</code>.
-     * @throws     IndexOutOfBoundsException If <code>off</code> is negative,
-     *             <code>len</code> is negative, or <code>len</code> is greater than
-     *             <code>b.length - off</code>
-     * @throws     IOException if the pipe is <a href="#BROKEN"> <code>broken</code></a>,
+     * @throws     NullPointerException If {@code b} is {@code null}.
+     * @throws     IndexOutOfBoundsException If {@code off} is negative,
+     *             {@code len} is negative, or {@code len} is greater than
+     *             {@code b.length - off}
+     * @throws     IOException if the pipe is <a href="#BROKEN"> {@code broken}</a>,
      *           {@link #connect(java.io.PipedOutputStream) unconnected},
      *           closed, or if an I/O error occurs.
      */
@@ -418,7 +418,7 @@
      *         without blocking, or {@code 0} if this input stream has been
      *         closed by invoking its {@link #close()} method, or if the pipe
      *         is {@link #connect(java.io.PipedOutputStream) unconnected}, or
-     *         <a href="#BROKEN"> <code>broken</code></a>.
+     *         <a href="#BROKEN"> {@code broken}</a>.
      *
      * @throws IOException  if an I/O error occurs.
      * @since  1.0.2
--- a/src/java.base/share/classes/java/io/PipedOutputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/PipedOutputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -31,8 +31,8 @@
  * A piped output stream can be connected to a piped input stream
  * to create a communications pipe. The piped output stream is the
  * sending end of the pipe. Typically, data is written to a
- * <code>PipedOutputStream</code> object by one thread and data is
- * read from the connected <code>PipedInputStream</code> by some
+ * {@code PipedOutputStream} object by one thread and data is
+ * read from the connected {@code PipedInputStream} by some
  * other thread. Attempting to use both objects from a single thread
  * is not recommended as it may deadlock the thread.
  * The pipe is said to be <a id=BROKEN> <i>broken</i> </a> if a
@@ -55,7 +55,7 @@
     /**
      * Creates a piped output stream connected to the specified piped
      * input stream. Data bytes written to this stream will then be
-     * available as input from <code>snk</code>.
+     * available as input from {@code snk}.
      *
      * @param      snk   The piped input stream to connect to.
      * @throws     IOException  if an I/O error occurs.
@@ -78,10 +78,10 @@
     /**
      * Connects this piped output stream to a receiver. If this object
      * is already connected to some other piped input stream, an
-     * <code>IOException</code> is thrown.
+     * {@code IOException} is thrown.
      * <p>
-     * If <code>snk</code> is an unconnected piped input stream and
-     * <code>src</code> is an unconnected piped output stream, they may
+     * If {@code snk} is an unconnected piped input stream and
+     * {@code src} is an unconnected piped output stream, they may
      * be connected by either the call:
      * <blockquote><pre>
      * src.connect(snk)</pre></blockquote>
@@ -106,11 +106,11 @@
     }
 
     /**
-     * Writes the specified <code>byte</code> to the piped output stream.
+     * Writes the specified {@code byte} to the piped output stream.
      * <p>
-     * Implements the <code>write</code> method of <code>OutputStream</code>.
+     * Implements the {@code write} method of {@code OutputStream}.
      *
-     * @param   b   the <code>byte</code> to be written.
+     * @param   b   the {@code byte} to be written.
      * @throws  IOException if the pipe is <a href=#BROKEN> broken</a>,
      *          {@link #connect(java.io.PipedInputStream) unconnected},
      *          closed, or if an I/O error occurs.
@@ -123,8 +123,8 @@
     }
 
     /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to this piped output stream.
+     * Writes {@code len} bytes from the specified byte array
+     * starting at offset {@code off} to this piped output stream.
      * This method blocks until all the bytes are written to the output
      * stream.
      *
--- a/src/java.base/share/classes/java/io/PipedReader.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/PipedReader.java	Tue Sep 24 09:43:43 2019 +0100
@@ -59,7 +59,7 @@
      * The index of the position in the circular buffer at which the
      * next character of data will be stored when received from the connected
      * piped writer. <code>in&lt;0</code> implies the buffer is empty,
-     * <code>in==out</code> implies the buffer is full
+     * {@code in==out} implies the buffer is full
      */
     int in = -1;
 
@@ -70,9 +70,9 @@
     int out = 0;
 
     /**
-     * Creates a <code>PipedReader</code> so
+     * Creates a {@code PipedReader} so
      * that it is connected to the piped writer
-     * <code>src</code>. Data written to <code>src</code>
+     * {@code src}. Data written to {@code src}
      * will then be available as input from this stream.
      *
      * @param      src   the stream to connect to.
@@ -83,9 +83,9 @@
     }
 
     /**
-     * Creates a <code>PipedReader</code> so that it is connected
-     * to the piped writer <code>src</code> and uses the specified
-     * pipe size for the pipe's buffer. Data written to <code>src</code>
+     * Creates a {@code PipedReader} so that it is connected
+     * to the piped writer {@code src} and uses the specified
+     * pipe size for the pipe's buffer. Data written to {@code src}
      * will then be  available as input from this stream.
 
      * @param      src       the stream to connect to.
@@ -101,10 +101,10 @@
 
 
     /**
-     * Creates a <code>PipedReader</code> so
+     * Creates a {@code PipedReader} so
      * that it is not yet {@linkplain #connect(java.io.PipedWriter)
      * connected}. It must be {@linkplain java.io.PipedWriter#connect(
-     * java.io.PipedReader) connected} to a <code>PipedWriter</code>
+     * java.io.PipedReader) connected} to a {@code PipedWriter}
      * before being used.
      */
     public PipedReader() {
@@ -112,11 +112,11 @@
     }
 
     /**
-     * Creates a <code>PipedReader</code> so that it is not yet
+     * Creates a {@code PipedReader} so that it is not yet
      * {@link #connect(java.io.PipedWriter) connected} and uses
      * the specified pipe size for the pipe's buffer.
      * It must be  {@linkplain java.io.PipedWriter#connect(
-     * java.io.PipedReader) connected} to a <code>PipedWriter</code>
+     * java.io.PipedReader) connected} to a {@code PipedWriter}
      * before being used.
      *
      * @param   pipeSize the size of the pipe's buffer.
@@ -136,21 +136,21 @@
 
     /**
      * Causes this piped reader to be connected
-     * to the piped  writer <code>src</code>.
+     * to the piped  writer {@code src}.
      * If this object is already connected to some
-     * other piped writer, an <code>IOException</code>
+     * other piped writer, an {@code IOException}
      * is thrown.
      * <p>
-     * If <code>src</code> is an
-     * unconnected piped writer and <code>snk</code>
+     * If {@code src} is an
+     * unconnected piped writer and {@code snk}
      * is an unconnected piped reader, they
      * may be connected by either the call:
      *
-     * <pre><code>snk.connect(src)</code> </pre>
+     * <pre>{@code snk.connect(src)} </pre>
      * <p>
      * or the call:
      *
-     * <pre><code>src.connect(snk)</code> </pre>
+     * <pre>{@code src.connect(snk)} </pre>
      * <p>
      * The two calls have the same effect.
      *
@@ -219,14 +219,14 @@
     /**
      * Reads the next character of data from this piped stream.
      * If no character is available because the end of the stream
-     * has been reached, the value <code>-1</code> is returned.
+     * has been reached, the value {@code -1} is returned.
      * This method blocks until input data is available, the end of
      * the stream is detected, or an exception is thrown.
      *
-     * @return  the next character of data, or <code>-1</code> if the end of the
+     * @return  the next character of data, or {@code -1} if the end of the
      *          stream is reached.
      * @throws  IOException  if the pipe is
-     *          <a href=PipedInputStream.html#BROKEN> <code>broken</code></a>,
+     *          <a href=PipedInputStream.html#BROKEN> {@code broken}</a>,
      *          {@link #connect(java.io.PipedWriter) unconnected}, closed,
      *          or an I/O error occurs.
      */
@@ -270,20 +270,20 @@
     }
 
     /**
-     * Reads up to <code>len</code> characters of data from this piped
-     * stream into an array of characters. Less than <code>len</code> characters
+     * Reads up to {@code len} characters of data from this piped
+     * stream into an array of characters. Less than {@code len} characters
      * will be read if the end of the data stream is reached or if
-     * <code>len</code> exceeds the pipe's buffer size. This method
+     * {@code len} exceeds the pipe's buffer size. This method
      * blocks until at least one character of input is available.
      *
      * @param      cbuf     the buffer into which the data is read.
      * @param      off   the start offset of the data.
      * @param      len   the maximum number of characters read.
      * @return     the total number of characters read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
+     *             {@code -1} if there is no more data because the end of
      *             the stream has been reached.
      * @throws     IOException  if the pipe is
-     *             <a href=PipedInputStream.html#BROKEN> <code>broken</code></a>,
+     *             <a href=PipedInputStream.html#BROKEN> {@code broken}</a>,
      *             {@link #connect(java.io.PipedWriter) unconnected}, closed,
      *             or an I/O error occurs.
      * @throws     IndexOutOfBoundsException {@inheritDoc}
@@ -331,7 +331,7 @@
      * stream is ready if the circular buffer is not empty.
      *
      * @throws     IOException  if the pipe is
-     *             <a href=PipedInputStream.html#BROKEN> <code>broken</code></a>,
+     *             <a href=PipedInputStream.html#BROKEN> {@code broken}</a>,
      *             {@link #connect(java.io.PipedWriter) unconnected}, or closed.
      */
     public synchronized boolean ready() throws IOException {
--- a/src/java.base/share/classes/java/io/PipedWriter.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/PipedWriter.java	Tue Sep 24 09:43:43 2019 +0100
@@ -50,7 +50,7 @@
     /**
      * Creates a piped writer connected to the specified piped
      * reader. Data characters written to this stream will then be
-     * available as input from <code>snk</code>.
+     * available as input from {@code snk}.
      *
      * @param      snk   The piped reader to connect to.
      * @throws     IOException  if an I/O error occurs.
@@ -73,10 +73,10 @@
     /**
      * Connects this piped writer to a receiver. If this object
      * is already connected to some other piped reader, an
-     * <code>IOException</code> is thrown.
+     * {@code IOException} is thrown.
      * <p>
-     * If <code>snk</code> is an unconnected piped reader and
-     * <code>src</code> is an unconnected piped writer, they may
+     * If {@code snk} is an unconnected piped reader and
+     * {@code src} is an unconnected piped writer, they may
      * be connected by either the call:
      * <blockquote><pre>
      * src.connect(snk)</pre></blockquote>
@@ -104,16 +104,16 @@
     }
 
     /**
-     * Writes the specified <code>char</code> to the piped output stream.
+     * Writes the specified {@code char} to the piped output stream.
      * If a thread was reading data characters from the connected piped input
      * stream, but the thread is no longer alive, then an
-     * <code>IOException</code> is thrown.
+     * {@code IOException} is thrown.
      * <p>
-     * Implements the <code>write</code> method of <code>Writer</code>.
+     * Implements the {@code write} method of {@code Writer}.
      *
-     * @param   c   the <code>char</code> to be written.
+     * @param   c   the {@code char} to be written.
      * @throw   IOException  if the pipe is
-     *          <a href=PipedOutputStream.html#BROKEN> <code>broken</code></a>,
+     *          <a href=PipedOutputStream.html#BROKEN> {@code broken}</a>,
      *          {@link #connect(java.io.PipedReader) unconnected}, closed
      *          or an I/O error occurs.
      */
@@ -143,7 +143,7 @@
      *          of the given array
      *
      * @throws  IOException  if the pipe is
-     *          <a href=PipedOutputStream.html#BROKEN><code>broken</code></a>,
+     *          <a href=PipedOutputStream.html#BROKEN>{@code broken}</a>,
      *          {@link #connect(java.io.PipedReader) unconnected}, closed
      *          or an I/O error occurs.
      */
--- a/src/java.base/share/classes/java/io/PushbackInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/PushbackInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -26,7 +26,7 @@
 package java.io;
 
 /**
- * A <code>PushbackInputStream</code> adds
+ * A {@code PushbackInputStream} adds
  * functionality to another input stream, namely
  * the  ability to "push back" or "unread" bytes,
  * by storing pushed-back bytes in an internal buffer.
@@ -59,8 +59,8 @@
 
     /**
      * The position within the pushback buffer from which the next byte will
-     * be read.  When the buffer is empty, <code>pos</code> is equal to
-     * <code>buf.length</code>; when the buffer is full, <code>pos</code> is
+     * be read.  When the buffer is empty, {@code pos} is equal to
+     * {@code buf.length}; when the buffer is full, {@code pos} is
      * equal to zero.
      *
      * @since   1.1
@@ -76,10 +76,10 @@
     }
 
     /**
-     * Creates a <code>PushbackInputStream</code>
-     * with a pushback buffer of the specified <code>size</code>,
+     * Creates a {@code PushbackInputStream}
+     * with a pushback buffer of the specified {@code size},
      * and saves its argument, the input stream
-     * <code>in</code>, for later use. Initially,
+     * {@code in}, for later use. Initially,
      * the pushback buffer is empty.
      *
      * @param  in    the input stream from which bytes will be read.
@@ -97,9 +97,9 @@
     }
 
     /**
-     * Creates a <code>PushbackInputStream</code>
+     * Creates a {@code PushbackInputStream}
      * with a 1-byte pushback buffer, and saves its argument, the input stream
-     * <code>in</code>, for later use. Initially,
+     * {@code in}, for later use. Initially,
      * the pushback buffer is empty.
      *
      * @param   in   the input stream from which bytes will be read.
@@ -110,18 +110,18 @@
 
     /**
      * Reads the next byte of data from this input stream. The value
-     * byte is returned as an <code>int</code> in the range
-     * <code>0</code> to <code>255</code>. If no byte is available
+     * byte is returned as an {@code int} in the range
+     * {@code 0} to {@code 255}. If no byte is available
      * because the end of the stream has been reached, the value
-     * <code>-1</code> is returned. This method blocks until input data
+     * {@code -1} is returned. This method blocks until input data
      * is available, the end of the stream is detected, or an exception
      * is thrown.
      *
      * <p> This method returns the most recently pushed-back byte, if there is
-     * one, and otherwise calls the <code>read</code> method of its underlying
+     * one, and otherwise calls the {@code read} method of its underlying
      * input stream and returns whatever value that method returns.
      *
-     * @return     the next byte of data, or <code>-1</code> if the end of the
+     * @return     the next byte of data, or {@code -1} if the end of the
      *             stream has been reached.
      * @throws     IOException  if this input stream has been closed by
      *             invoking its {@link #close()} method,
@@ -137,23 +137,23 @@
     }
 
     /**
-     * Reads up to <code>len</code> bytes of data from this input stream into
+     * Reads up to {@code len} bytes of data from this input stream into
      * an array of bytes.  This method first reads any pushed-back bytes; after
-     * that, if fewer than <code>len</code> bytes have been read then it
-     * reads from the underlying input stream. If <code>len</code> is not zero, the method
+     * that, if fewer than {@code len} bytes have been read then it
+     * reads from the underlying input stream. If {@code len} is not zero, the method
      * blocks until at least 1 byte of input is available; otherwise, no
-     * bytes are read and <code>0</code> is returned.
+     * bytes are read and {@code 0} is returned.
      *
      * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset in the destination array <code>b</code>
+     * @param      off   the start offset in the destination array {@code b}
      * @param      len   the maximum number of bytes read.
      * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
+     *             {@code -1} if there is no more data because the end of
      *             the stream has been reached.
-     * @throws     NullPointerException If <code>b</code> is <code>null</code>.
-     * @throws     IndexOutOfBoundsException If <code>off</code> is negative,
-     *             <code>len</code> is negative, or <code>len</code> is greater than
-     *             <code>b.length - off</code>
+     * @throws     NullPointerException If {@code b} is {@code null}.
+     * @throws     IndexOutOfBoundsException If {@code off} is negative,
+     *             {@code len} is negative, or {@code len} is greater than
+     *             {@code b.length - off}
      * @throws     IOException  if this input stream has been closed by
      *             invoking its {@link #close()} method,
      *             or an I/O error occurs.
@@ -192,9 +192,9 @@
     /**
      * Pushes back a byte by copying it to the front of the pushback buffer.
      * After this method returns, the next byte to be read will have the value
-     * <code>(byte)b</code>.
+     * {@code (byte)b}.
      *
-     * @param      b   the <code>int</code> value whose low-order
+     * @param      b   the {@code int} value whose low-order
      *                  byte is to be pushed back.
      * @throws    IOException If there is not enough room in the pushback
      *            buffer for the byte, or this input stream has been closed by
@@ -211,13 +211,13 @@
     /**
      * Pushes back a portion of an array of bytes by copying it to the front
      * of the pushback buffer.  After this method returns, the next byte to be
-     * read will have the value <code>b[off]</code>, the byte after that will
-     * have the value <code>b[off+1]</code>, and so forth.
+     * read will have the value {@code b[off]}, the byte after that will
+     * have the value {@code b[off+1]}, and so forth.
      *
      * @param     b the byte array to push back.
      * @param     off the start offset of the data.
      * @param     len the number of bytes to push back.
-     * @throws    NullPointerException If <code>b</code> is <code>null</code>.
+     * @throws    NullPointerException If {@code b} is {@code null}.
      * @throws    IOException If there is not enough room in the pushback
      *            buffer for the specified number of bytes,
      *            or this input stream has been closed by
@@ -236,11 +236,11 @@
     /**
      * Pushes back an array of bytes by copying it to the front of the
      * pushback buffer.  After this method returns, the next byte to be read
-     * will have the value <code>b[0]</code>, the byte after that will have the
-     * value <code>b[1]</code>, and so forth.
+     * will have the value {@code b[0]}, the byte after that will have the
+     * value {@code b[1]}, and so forth.
      *
      * @param     b the byte array to push back
-     * @throws    NullPointerException If <code>b</code> is <code>null</code>.
+     * @throws    NullPointerException If {@code b} is {@code null}.
      * @throws    IOException If there is not enough room in the pushback
      *            buffer for the specified number of bytes,
      *            or this input stream has been closed by
@@ -280,14 +280,14 @@
     }
 
     /**
-     * Skips over and discards <code>n</code> bytes of data from this
-     * input stream. The <code>skip</code> method may, for a variety of
+     * Skips over and discards {@code n} bytes of data from this
+     * input stream. The {@code skip} method may, for a variety of
      * reasons, end up skipping over some smaller number of bytes,
-     * possibly zero.  If <code>n</code> is negative, no bytes are skipped.
+     * possibly zero.  If {@code n} is negative, no bytes are skipped.
      *
-     * <p> The <code>skip</code> method of <code>PushbackInputStream</code>
+     * <p> The {@code skip} method of {@code PushbackInputStream}
      * first skips over the bytes in the pushback buffer, if any.  It then
-     * calls the <code>skip</code> method of the underlying input stream if
+     * calls the {@code skip} method of the underlying input stream if
      * more bytes need to be skipped.  The actual number of bytes skipped
      * is returned.
      *
@@ -322,11 +322,11 @@
     }
 
     /**
-     * Tests if this input stream supports the <code>mark</code> and
-     * <code>reset</code> methods, which it does not.
+     * Tests if this input stream supports the {@code mark} and
+     * {@code reset} methods, which it does not.
      *
-     * @return   <code>false</code>, since this class does not support the
-     *           <code>mark</code> and <code>reset</code> methods.
+     * @return   {@code false}, since this class does not support the
+     *           {@code mark} and {@code reset} methods.
      * @see      java.io.InputStream#mark(int)
      * @see      java.io.InputStream#reset()
      */
@@ -337,7 +337,7 @@
     /**
      * Marks the current position in this input stream.
      *
-     * <p> The <code>mark</code> method of <code>PushbackInputStream</code>
+     * <p> The {@code mark} method of {@code PushbackInputStream}
      * does nothing.
      *
      * @param   readlimit   the maximum limit of bytes that can be read before
@@ -349,11 +349,11 @@
 
     /**
      * Repositions this stream to the position at the time the
-     * <code>mark</code> method was last called on this input stream.
+     * {@code mark} method was last called on this input stream.
      *
-     * <p> The method <code>reset</code> for class
-     * <code>PushbackInputStream</code> does nothing except throw an
-     * <code>IOException</code>.
+     * <p> The method {@code reset} for class
+     * {@code PushbackInputStream} does nothing except throw an
+     * {@code IOException}.
      *
      * @throws  IOException  if this method is invoked.
      * @see     java.io.InputStream#mark(int)
--- a/src/java.base/share/classes/java/io/PushbackReader.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/PushbackReader.java	Tue Sep 24 09:43:43 2019 +0100
@@ -142,7 +142,7 @@
     /**
      * Pushes back a single character by copying it to the front of the
      * pushback buffer. After this method returns, the next character to be read
-     * will have the value <code>(char)c</code>.
+     * will have the value {@code (char)c}.
      *
      * @param  c  The int value representing a character to be pushed back
      *
@@ -161,8 +161,8 @@
     /**
      * Pushes back a portion of an array of characters by copying it to the
      * front of the pushback buffer.  After this method returns, the next
-     * character to be read will have the value <code>cbuf[off]</code>, the
-     * character after that will have the value <code>cbuf[off+1]</code>, and
+     * character to be read will have the value {@code cbuf[off]}, the
+     * character after that will have the value {@code cbuf[off+1]}, and
      * so forth.
      *
      * @param      cbuf  Character array
@@ -185,8 +185,8 @@
     /**
      * Pushes back an array of characters by copying it to the front of the
      * pushback buffer.  After this method returns, the next character to be
-     * read will have the value <code>cbuf[0]</code>, the character after that
-     * will have the value <code>cbuf[1]</code>, and so forth.
+     * read will have the value {@code cbuf[0]}, the character after that
+     * will have the value {@code cbuf[1]}, and so forth.
      *
      * @param      cbuf  Character array to push back
      *
@@ -210,8 +210,8 @@
     }
 
     /**
-     * Marks the present position in the stream. The <code>mark</code>
-     * for class <code>PushbackReader</code> always throws an exception.
+     * Marks the present position in the stream. The {@code mark}
+     * for class {@code PushbackReader} always throws an exception.
      *
      * @throws     IOException  Always, since mark is not supported
      */
@@ -220,8 +220,8 @@
     }
 
     /**
-     * Resets the stream. The <code>reset</code> method of
-     * <code>PushbackReader</code> always throws an exception.
+     * Resets the stream. The {@code reset} method of
+     * {@code PushbackReader} always throws an exception.
      *
      * @throws     IOException  Always, since reset is not supported
      */
@@ -261,7 +261,7 @@
      *
      * @return    The number of characters actually skipped
      *
-     * @throws    IllegalArgumentException  If <code>n</code> is negative.
+     * @throws    IllegalArgumentException  If {@code n} is negative.
      * @throws    IOException  If an I/O error occurs
      */
     public long skip(long n) throws IOException {
--- a/src/java.base/share/classes/java/io/Reader.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/Reader.java	Tue Sep 24 09:43:43 2019 +0100
@@ -262,7 +262,7 @@
      *
      * @return    The number of characters actually skipped
      *
-     * @throws     IllegalArgumentException  If <code>n</code> is negative.
+     * @throws     IllegalArgumentException  If {@code n} is negative.
      * @throws     IOException  If an I/O error occurs
      */
     public long skip(long n) throws IOException {
--- a/src/java.base/share/classes/java/io/SequenceInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/SequenceInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -30,7 +30,7 @@
 import java.util.Vector;
 
 /**
- * A <code>SequenceInputStream</code> represents
+ * A {@code SequenceInputStream} represents
  * the logical concatenation of other input
  * streams. It starts out with an ordered
  * collection of input streams and reads from
@@ -48,17 +48,17 @@
     InputStream in;
 
     /**
-     * Initializes a newly created <code>SequenceInputStream</code>
+     * Initializes a newly created {@code SequenceInputStream}
      * by remembering the argument, which must
-     * be an <code>Enumeration</code>  that produces
-     * objects whose run-time type is <code>InputStream</code>.
+     * be an {@code Enumeration}  that produces
+     * objects whose run-time type is {@code InputStream}.
      * The input streams that are  produced by
      * the enumeration will be read, in order,
      * to provide the bytes to be read  from this
-     * <code>SequenceInputStream</code>. After
+     * {@code SequenceInputStream}. After
      * each input stream from the enumeration
      * is exhausted, it is closed by calling its
-     * <code>close</code> method.
+     * {@code close} method.
      *
      * @param   e   an enumeration of input streams.
      * @see     java.util.Enumeration
@@ -70,11 +70,11 @@
 
     /**
      * Initializes a newly
-     * created <code>SequenceInputStream</code>
+     * created {@code SequenceInputStream}
      * by remembering the two arguments, which
-     * will be read in order, first <code>s1</code>
-     * and then <code>s2</code>, to provide the
-     * bytes to be read from this <code>SequenceInputStream</code>.
+     * will be read in order, first {@code s1}
+     * and then {@code s2}, to provide the
+     * bytes to be read from this {@code SequenceInputStream}.
      *
      * @param   s1   the first input stream to read.
      * @param   s2   the second input stream to read.
@@ -135,19 +135,19 @@
 
     /**
      * Reads the next byte of data from this input stream. The byte is
-     * returned as an <code>int</code> in the range <code>0</code> to
-     * <code>255</code>. If no byte is available because the end of the
-     * stream has been reached, the value <code>-1</code> is returned.
+     * returned as an {@code int} in the range {@code 0} to
+     * {@code 255}. If no byte is available because the end of the
+     * stream has been reached, the value {@code -1} is returned.
      * This method blocks until input data is available, the end of the
      * stream is detected, or an exception is thrown.
      * <p>
      * This method
      * tries to read one character from the current substream. If it
-     * reaches the end of the stream, it calls the <code>close</code>
+     * reaches the end of the stream, it calls the {@code close}
      * method of the current substream and begins reading from the next
      * substream.
      *
-     * @return     the next byte of data, or <code>-1</code> if the end of the
+     * @return     the next byte of data, or {@code -1} if the end of the
      *             stream is reached.
      * @throws     IOException  if an I/O error occurs.
      */
@@ -163,26 +163,26 @@
     }
 
     /**
-     * Reads up to <code>len</code> bytes of data from this input stream
-     * into an array of bytes.  If <code>len</code> is not zero, the method
+     * Reads up to {@code len} bytes of data from this input stream
+     * into an array of bytes.  If {@code len} is not zero, the method
      * blocks until at least 1 byte of input is available; otherwise, no
-     * bytes are read and <code>0</code> is returned.
+     * bytes are read and {@code 0} is returned.
      * <p>
-     * The <code>read</code> method of <code>SequenceInputStream</code>
+     * The {@code read} method of {@code SequenceInputStream}
      * tries to read the data from the current substream. If it fails to
      * read any characters because the substream has reached the end of
-     * the stream, it calls the <code>close</code> method of the current
+     * the stream, it calls the {@code close} method of the current
      * substream and begins reading from the next substream.
      *
      * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset in array <code>b</code>
+     * @param      off   the start offset in array {@code b}
      *                   at which the data is written.
      * @param      len   the maximum number of bytes read.
      * @return     int   the number of bytes read.
-     * @throws     NullPointerException If <code>b</code> is <code>null</code>.
-     * @throws     IndexOutOfBoundsException If <code>off</code> is negative,
-     *             <code>len</code> is negative, or <code>len</code> is
-     *             greater than <code>b.length - off</code>
+     * @throws     NullPointerException If {@code b} is {@code null}.
+     * @throws     IndexOutOfBoundsException If {@code off} is negative,
+     *             {@code len} is negative, or {@code len} is
+     *             greater than {@code b.length - off}
      * @throws     IOException  if an I/O error occurs.
      */
     public int read(byte b[], int off, int len) throws IOException {
@@ -208,14 +208,14 @@
     /**
      * Closes this input stream and releases any system resources
      * associated with the stream.
-     * A closed <code>SequenceInputStream</code>
+     * A closed {@code SequenceInputStream}
      * cannot  perform input operations and cannot
      * be reopened.
      * <p>
      * If this stream was created
      * from an enumeration, all remaining elements
      * are requested from the enumeration and closed
-     * before the <code>close</code> method returns.
+     * before the {@code close} method returns.
      *
      * @throws     IOException  if an I/O error occurs.
      */
--- a/src/java.base/share/classes/java/io/Serializable.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/Serializable.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -142,8 +142,8 @@
  * serialVersionUID than that of the corresponding sender's class, then
  * deserialization will result in an {@link InvalidClassException}.  A
  * serializable class can declare its own serialVersionUID explicitly by
- * declaring a field named <code>"serialVersionUID"</code> that must be static,
- * final, and of type <code>long</code>:
+ * declaring a field named {@code "serialVersionUID"} that must be static,
+ * final, and of type {@code long}:
  *
  * <PRE>
  * ANY-ACCESS-MODIFIER static final long serialVersionUID = 42L;
@@ -157,11 +157,11 @@
  * serialVersionUID values, since the default serialVersionUID computation is
  * highly sensitive to class details that may vary depending on compiler
  * implementations, and can thus result in unexpected
- * <code>InvalidClassException</code>s during deserialization.  Therefore, to
+ * {@code InvalidClassException}s during deserialization.  Therefore, to
  * guarantee a consistent serialVersionUID value across different java compiler
  * implementations, a serializable class must declare an explicit
  * serialVersionUID value.  It is also strongly advised that explicit
- * serialVersionUID declarations use the <code>private</code> modifier where
+ * serialVersionUID declarations use the {@code private} modifier where
  * possible, since such declarations apply only to the immediately declaring
  * class--serialVersionUID fields are not useful as inherited members. Array
  * classes cannot declare an explicit serialVersionUID, so they always have
--- a/src/java.base/share/classes/java/io/SerializablePermission.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/SerializablePermission.java	Tue Sep 24 09:43:43 2019 +0100
@@ -116,8 +116,8 @@
      *
      * @param name the name of the SerializablePermission.
      *
-     * @throws NullPointerException if <code>name</code> is <code>null</code>.
-     * @throws IllegalArgumentException if <code>name</code> is empty.
+     * @throws NullPointerException if {@code name} is {@code null}.
+     * @throws IllegalArgumentException if {@code name} is empty.
      */
     public SerializablePermission(String name)
     {
@@ -132,8 +132,8 @@
      * @param name the name of the SerializablePermission.
      * @param actions currently unused and must be set to null
      *
-     * @throws NullPointerException if <code>name</code> is <code>null</code>.
-     * @throws IllegalArgumentException if <code>name</code> is empty.
+     * @throws NullPointerException if {@code name} is {@code null}.
+     * @throws IllegalArgumentException if {@code name} is empty.
      */
 
     public SerializablePermission(String name, String actions)
--- a/src/java.base/share/classes/java/io/StringBufferInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/StringBufferInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * This class allows an application to create an input stream in
  * which the bytes read are supplied by the contents of a string.
  * Applications can also read bytes from a byte array by using a
- * <code>ByteArrayInputStream</code>.
+ * {@code ByteArrayInputStream}.
  * <p>
  * Only the low eight bits of each character in the string are used by
  * this class.
@@ -40,7 +40,7 @@
  * @since      1.0
  * @deprecated This class does not properly convert characters into bytes.  As
  *             of JDK&nbsp;1.1, the preferred way to create a stream from a
- *             string is via the <code>StringReader</code> class.
+ *             string is via the {@code StringReader} class.
  */
 @Deprecated
 public
@@ -76,16 +76,16 @@
 
     /**
      * Reads the next byte of data from this input stream. The value
-     * byte is returned as an <code>int</code> in the range
-     * <code>0</code> to <code>255</code>. If no byte is available
+     * byte is returned as an {@code int} in the range
+     * {@code 0} to {@code 255}. If no byte is available
      * because the end of the stream has been reached, the value
-     * <code>-1</code> is returned.
+     * {@code -1} is returned.
      * <p>
-     * The <code>read</code> method of
-     * <code>StringBufferInputStream</code> cannot block. It returns the
+     * The {@code read} method of
+     * {@code StringBufferInputStream} cannot block. It returns the
      * low eight bits of the next character in this input stream's buffer.
      *
-     * @return     the next byte of data, or <code>-1</code> if the end of the
+     * @return     the next byte of data, or {@code -1} if the end of the
      *             stream is reached.
      */
     public synchronized int read() {
@@ -93,11 +93,11 @@
     }
 
     /**
-     * Reads up to <code>len</code> bytes of data from this input stream
+     * Reads up to {@code len} bytes of data from this input stream
      * into an array of bytes.
      * <p>
-     * The <code>read</code> method of
-     * <code>StringBufferInputStream</code> cannot block. It copies the
+     * The {@code read} method of
+     * {@code StringBufferInputStream} cannot block. It copies the
      * low eight bits from the characters in this input stream's buffer into
      * the byte array argument.
      *
@@ -105,7 +105,7 @@
      * @param      off   the start offset of the data.
      * @param      len   the maximum number of bytes read.
      * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
+     *             {@code -1} if there is no more data because the end of
      *             the stream has been reached.
      */
     @SuppressWarnings("deprecation")
@@ -133,7 +133,7 @@
     }
 
     /**
-     * Skips <code>n</code> bytes of input from this input stream. Fewer
+     * Skips {@code n} bytes of input from this input stream. Fewer
      * bytes might be skipped if the end of the input stream is reached.
      *
      * @param      n   the number of bytes to be skipped.
--- a/src/java.base/share/classes/java/io/StringReader.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/StringReader.java	Tue Sep 24 09:43:43 2019 +0100
@@ -108,9 +108,9 @@
      * Skips the specified number of characters in the stream. Returns
      * the number of characters that were skipped.
      *
-     * <p>The <code>ns</code> parameter may be negative, even though the
-     * <code>skip</code> method of the {@link Reader} superclass throws
-     * an exception in this case. Negative values of <code>ns</code> cause the
+     * <p>The {@code ns} parameter may be negative, even though the
+     * {@code skip} method of the {@link Reader} superclass throws
+     * an exception in this case. Negative values of {@code ns} cause the
      * stream to skip backwards. Negative return values indicate a skip
      * backwards. It is not possible to skip backwards past the beginning of
      * the string.
--- a/src/java.base/share/classes/java/io/UTFDataFormatException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/io/UTFDataFormatException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -32,7 +32,7 @@
  * input stream or by any class that implements the data input
  * interface.
  * See the
- * <a href="DataInput.html#modified-utf-8"><code>DataInput</code></a>
+ * <a href="DataInput.html#modified-utf-8">{@code DataInput}</a>
  * class description for the format in
  * which modified UTF-8 strings are read and written.
  *
@@ -48,19 +48,19 @@
     private static final long serialVersionUID = 420743449228280612L;
 
     /**
-     * Constructs a <code>UTFDataFormatException</code> with
-     * <code>null</code> as its error detail message.
+     * Constructs a {@code UTFDataFormatException} with
+     * {@code null} as its error detail message.
      */
     public UTFDataFormatException() {
         super();
     }
 
     /**
-     * Constructs a <code>UTFDataFormatException</code> with the
-     * specified detail message. The string <code>s</code> can be
+     * Constructs a {@code UTFDataFormatException} with the
+     * specified detail message. The string {@code s} can be
      * retrieved later by the
      * <code>{@link java.lang.Throwable#getMessage}</code>
-     * method of class <code>java.lang.Throwable</code>.
+     * method of class {@code java.lang.Throwable}.
      *
      * @param   s   the detail message.
      */
--- a/src/java.base/share/classes/java/lang/AbstractMethodError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/AbstractMethodError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -41,14 +41,14 @@
     private static final long serialVersionUID = -1654391082989018462L;
 
     /**
-     * Constructs an <code>AbstractMethodError</code> with no detail  message.
+     * Constructs an {@code AbstractMethodError} with no detail  message.
      */
     public AbstractMethodError() {
         super();
     }
 
     /**
-     * Constructs an <code>AbstractMethodError</code> with the specified
+     * Constructs an {@code AbstractMethodError} with the specified
      * detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/ArrayStoreException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/ArrayStoreException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -28,7 +28,7 @@
 /**
  * Thrown to indicate that an attempt has been made to store the
  * wrong type of object into an array of objects. For example, the
- * following code generates an <code>ArrayStoreException</code>:
+ * following code generates an {@code ArrayStoreException}:
  * <blockquote><pre>
  *     Object x[] = new String[3];
  *     x[0] = new Integer(0);
@@ -43,14 +43,14 @@
     private static final long serialVersionUID = -4522193890499838241L;
 
     /**
-     * Constructs an <code>ArrayStoreException</code> with no detail message.
+     * Constructs an {@code ArrayStoreException} with no detail message.
      */
     public ArrayStoreException() {
         super();
     }
 
     /**
-     * Constructs an <code>ArrayStoreException</code> with the specified
+     * Constructs an {@code ArrayStoreException} with the specified
      * detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/AssertionError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/AssertionError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -79,7 +79,7 @@
 
     /**
      * Constructs an AssertionError with its detail message derived
-     * from the specified <code>boolean</code>, which is converted to
+     * from the specified {@code boolean}, which is converted to
      * a string as defined in section 15.18.1.1 of
      * <cite>The Java&trade; Language Specification</cite>.
      *
@@ -91,7 +91,7 @@
 
     /**
      * Constructs an AssertionError with its detail message derived
-     * from the specified <code>char</code>, which is converted to a
+     * from the specified {@code char}, which is converted to a
      * string as defined in section 15.18.1.1 of
      * <cite>The Java&trade; Language Specification</cite>.
      *
@@ -103,7 +103,7 @@
 
     /**
      * Constructs an AssertionError with its detail message derived
-     * from the specified <code>int</code>, which is converted to a
+     * from the specified {@code int}, which is converted to a
      * string as defined in section 15.18.1.1 of
      * <cite>The Java&trade; Language Specification</cite>.
      *
@@ -115,7 +115,7 @@
 
     /**
      * Constructs an AssertionError with its detail message derived
-     * from the specified <code>long</code>, which is converted to a
+     * from the specified {@code long}, which is converted to a
      * string as defined in section 15.18.1.1 of
      * <cite>The Java&trade; Language Specification</cite>.
      *
@@ -127,7 +127,7 @@
 
     /**
      * Constructs an AssertionError with its detail message derived
-     * from the specified <code>float</code>, which is converted to a
+     * from the specified {@code float}, which is converted to a
      * string as defined in section 15.18.1.1 of
      * <cite>The Java&trade; Language Specification</cite>.
      *
@@ -139,7 +139,7 @@
 
     /**
      * Constructs an AssertionError with its detail message derived
-     * from the specified <code>double</code>, which is converted to a
+     * from the specified {@code double}, which is converted to a
      * string as defined in section 15.18.1.1 of
      * <cite>The Java&trade; Language Specification</cite>.
      *
--- a/src/java.base/share/classes/java/lang/ClassCastException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/ClassCastException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -28,7 +28,7 @@
 /**
  * Thrown to indicate that the code has attempted to cast an object
  * to a subclass of which it is not an instance. For example, the
- * following code generates a <code>ClassCastException</code>:
+ * following code generates a {@code ClassCastException}:
  * <blockquote><pre>
  *     Object x = new Integer(0);
  *     System.out.println((String)x);
@@ -43,14 +43,14 @@
     private static final long serialVersionUID = -9223365651070458532L;
 
     /**
-     * Constructs a <code>ClassCastException</code> with no detail message.
+     * Constructs a {@code ClassCastException} with no detail message.
      */
     public ClassCastException() {
         super();
     }
 
     /**
-     * Constructs a <code>ClassCastException</code> with the specified
+     * Constructs a {@code ClassCastException} with the specified
      * detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/ClassFormatError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/ClassFormatError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -39,14 +39,14 @@
     private static final long serialVersionUID = -8420114879011949195L;
 
     /**
-     * Constructs a <code>ClassFormatError</code> with no detail message.
+     * Constructs a {@code ClassFormatError} with no detail message.
      */
     public ClassFormatError() {
         super();
     }
 
     /**
-     * Constructs a <code>ClassFormatError</code> with the specified
+     * Constructs a {@code ClassFormatError} with the specified
      * detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/ClassNotFoundException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/ClassNotFoundException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -34,10 +34,10 @@
  * Thrown when an application tries to load in a class through its
  * string name using:
  * <ul>
- * <li>The <code>forName</code> method in class <code>Class</code>.
- * <li>The <code>findSystemClass</code> method in class
- *     <code>ClassLoader</code> .
- * <li>The <code>loadClass</code> method in class <code>ClassLoader</code>.
+ * <li>The {@code forName} method in class {@code Class}.
+ * <li>The {@code findSystemClass} method in class
+ *     {@code ClassLoader} .
+ * <li>The {@code loadClass} method in class {@code ClassLoader}.
  * </ul>
  * <p>
  * but no definition for the class with the specified name could be found.
@@ -63,14 +63,14 @@
      private static final long serialVersionUID = 9176873029745254542L;
 
     /**
-     * Constructs a <code>ClassNotFoundException</code> with no detail message.
+     * Constructs a {@code ClassNotFoundException} with no detail message.
      */
     public ClassNotFoundException() {
         super((Throwable)null);  // Disallow initCause
     }
 
     /**
-     * Constructs a <code>ClassNotFoundException</code> with the
+     * Constructs a {@code ClassNotFoundException} with the
      * specified detail message.
      *
      * @param   s   the detail message.
@@ -80,7 +80,7 @@
     }
 
     /**
-     * Constructs a <code>ClassNotFoundException</code> with the
+     * Constructs a {@code ClassNotFoundException} with the
      * specified detail message and optional exception that was
      * raised while loading the class.
      *
@@ -100,7 +100,7 @@
      * The {@link Throwable#getCause()} method is now the preferred means of
      * obtaining this information.
      *
-     * @return the <code>Exception</code> that was raised while loading a class
+     * @return the {@code Exception} that was raised while loading a class
      * @since 1.2
      */
     public Throwable getException() {
--- a/src/java.base/share/classes/java/lang/CloneNotSupportedException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/CloneNotSupportedException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -26,12 +26,12 @@
 package java.lang;
 
 /**
- * Thrown to indicate that the <code>clone</code> method in class
- * <code>Object</code> has been called to clone an object, but that
- * the object's class does not implement the <code>Cloneable</code>
+ * Thrown to indicate that the {@code clone} method in class
+ * {@code Object} has been called to clone an object, but that
+ * the object's class does not implement the {@code Cloneable}
  * interface.
  * <p>
- * Applications that override the <code>clone</code> method can also
+ * Applications that override the {@code clone} method can also
  * throw this exception to indicate that an object could not or
  * should not be cloned.
  *
@@ -47,7 +47,7 @@
     private static final long serialVersionUID = 5195511250079656443L;
 
     /**
-     * Constructs a <code>CloneNotSupportedException</code> with no
+     * Constructs a {@code CloneNotSupportedException} with no
      * detail message.
      */
     public CloneNotSupportedException() {
@@ -55,7 +55,7 @@
     }
 
     /**
-     * Constructs a <code>CloneNotSupportedException</code> with the
+     * Constructs a {@code CloneNotSupportedException} with the
      * specified detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/Cloneable.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/Cloneable.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,14 +26,14 @@
 package java.lang;
 
 /**
- * A class implements the <code>Cloneable</code> interface to
+ * A class implements the {@code Cloneable} interface to
  * indicate to the {@link java.lang.Object#clone()} method that it
  * is legal for that method to make a
  * field-for-field copy of instances of that class.
  * <p>
  * Invoking Object's clone method on an instance that does not implement the
- * <code>Cloneable</code> interface results in the exception
- * <code>CloneNotSupportedException</code> being thrown.
+ * {@code Cloneable} interface results in the exception
+ * {@code CloneNotSupportedException} being thrown.
  * <p>
  * By convention, classes that implement this interface should override
  * {@code Object.clone} (which is protected) with a public method.
--- a/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,15 +34,15 @@
 
 
 /**
- * This is a utility class for <code>String.toLowerCase()</code> and
- * <code>String.toUpperCase()</code>, that handles special casing with
+ * This is a utility class for {@code String.toLowerCase()} and
+ * {@code String.toUpperCase()}, that handles special casing with
  * conditions.  In other words, it handles the mappings with conditions
  * that are defined in
  * <a href="http://www.unicode.org/Public/UNIDATA/SpecialCasing.txt">Special
  * Casing Properties</a> file.
  * <p>
  * Note that the unconditional case mappings (including 1:M mappings)
- * are handled in <code>Character.toLower/UpperCase()</code>.
+ * are handled in {@code Character.toLower/UpperCase()}.
  */
 final class ConditionalSpecialCasing {
 
@@ -329,7 +329,7 @@
     /**
      * Implements the "Before_Dot" condition
      *
-     * Specification: C is followed by <code>U+0307 COMBINING DOT ABOVE</code>.
+     * Specification: C is followed by {@code U+0307 COMBINING DOT ABOVE}.
      * Any sequence of characters with a combining class that is
      * neither 0 nor 230 may intervene between the current character
      * and the combining dot above.
--- a/src/java.base/share/classes/java/lang/ExceptionInInitializerError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/ExceptionInInitializerError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -32,7 +32,7 @@
 
 /**
  * Signals that an unexpected exception has occurred in a static initializer.
- * An <code>ExceptionInInitializerError</code> is thrown to indicate that an
+ * An {@code ExceptionInInitializerError} is thrown to indicate that an
  * exception occurred during evaluation of a static initializer or the
  * initializer for a static variable.
  *
@@ -54,8 +54,8 @@
     private static final long serialVersionUID = 1521711792217232256L;
 
     /**
-     * Constructs an <code>ExceptionInInitializerError</code> with
-     * <code>null</code> as its detail message string and with no saved
+     * Constructs an {@code ExceptionInInitializerError} with
+     * {@code null} as its detail message string and with no saved
      * throwable object.
      * A detail message is a String that describes this particular exception.
      */
@@ -64,10 +64,10 @@
     }
 
     /**
-     * Constructs a new <code>ExceptionInInitializerError</code> class by
-     * saving a reference to the <code>Throwable</code> object thrown for
+     * Constructs a new {@code ExceptionInInitializerError} class by
+     * saving a reference to the {@code Throwable} object thrown for
      * later retrieval by the {@link #getException()} method. The detail
-     * message string is set to <code>null</code>.
+     * message string is set to {@code null}.
      *
      * @param thrown The exception thrown
      */
@@ -97,8 +97,8 @@
      * obtaining this information.
      *
      * @return the saved throwable object of this
-     *         <code>ExceptionInInitializerError</code>, or <code>null</code>
-     *         if this <code>ExceptionInInitializerError</code> has no saved
+     *         {@code ExceptionInInitializerError}, or {@code null}
+     *         if this {@code ExceptionInInitializerError} has no saved
      *         throwable object.
      */
     public Throwable getException() {
--- a/src/java.base/share/classes/java/lang/IllegalAccessError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/IllegalAccessError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -41,14 +41,14 @@
     private static final long serialVersionUID = -8988904074992417891L;
 
     /**
-     * Constructs an <code>IllegalAccessError</code> with no detail message.
+     * Constructs an {@code IllegalAccessError} with no detail message.
      */
     public IllegalAccessError() {
         super();
     }
 
     /**
-     * Constructs an <code>IllegalAccessError</code> with the specified
+     * Constructs an {@code IllegalAccessError} with the specified
      * detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/IllegalAccessException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/IllegalAccessException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,7 @@
     private static final long serialVersionUID = 6616958222490762034L;
 
     /**
-     * Constructs an <code>IllegalAccessException</code> without a
+     * Constructs an {@code IllegalAccessException} without a
      * detail message.
      */
     public IllegalAccessException() {
@@ -68,7 +68,7 @@
     }
 
     /**
-     * Constructs an <code>IllegalAccessException</code> with a detail message.
+     * Constructs an {@code IllegalAccessException} with a detail message.
      *
      * @param   s   the detail message.
      */
--- a/src/java.base/share/classes/java/lang/IllegalArgumentException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/IllegalArgumentException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -35,7 +35,7 @@
 public
 class IllegalArgumentException extends RuntimeException {
     /**
-     * Constructs an <code>IllegalArgumentException</code> with no
+     * Constructs an {@code IllegalArgumentException} with no
      * detail message.
      */
     public IllegalArgumentException() {
@@ -43,7 +43,7 @@
     }
 
     /**
-     * Constructs an <code>IllegalArgumentException</code> with the
+     * Constructs an {@code IllegalArgumentException} with the
      * specified detail message.
      *
      * @param   s   the detail message.
@@ -56,7 +56,7 @@
      * Constructs a new exception with the specified detail message and
      * cause.
      *
-     * <p>Note that the detail message associated with <code>cause</code> is
+     * <p>Note that the detail message associated with {@code cause} is
      * <i>not</i> automatically incorporated in this exception's detail
      * message.
      *
--- a/src/java.base/share/classes/java/lang/IllegalMonitorStateException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/IllegalMonitorStateException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -44,7 +44,7 @@
     private static final long serialVersionUID = 3713306369498869069L;
 
     /**
-     * Constructs an <code>IllegalMonitorStateException</code> with no
+     * Constructs an {@code IllegalMonitorStateException} with no
      * detail message.
      */
     public IllegalMonitorStateException() {
@@ -52,7 +52,7 @@
     }
 
     /**
-     * Constructs an <code>IllegalMonitorStateException</code> with the
+     * Constructs an {@code IllegalMonitorStateException} with the
      * specified detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/IllegalStateException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/IllegalStateException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -59,7 +59,7 @@
      * Constructs a new exception with the specified detail message and
      * cause.
      *
-     * <p>Note that the detail message associated with <code>cause</code> is
+     * <p>Note that the detail message associated with {@code cause} is
      * <i>not</i> automatically incorporated in this exception's detail
      * message.
      *
--- a/src/java.base/share/classes/java/lang/IllegalThreadStateException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/IllegalThreadStateException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -28,8 +28,8 @@
 /**
  * Thrown to indicate that a thread is not in an appropriate state
  * for the requested operation. See, for example, the
- * <code>suspend</code> and <code>resume</code> methods in class
- * <code>Thread</code>.
+ * {@code suspend} and {@code resume} methods in class
+ * {@code Thread}.
  *
  * @author  unascribed
  * @see     java.lang.Thread#resume()
@@ -41,7 +41,7 @@
     private static final long serialVersionUID = -7626246362397460174L;
 
     /**
-     * Constructs an <code>IllegalThreadStateException</code> with no
+     * Constructs an {@code IllegalThreadStateException} with no
      * detail message.
      */
     public IllegalThreadStateException() {
@@ -49,7 +49,7 @@
     }
 
     /**
-     * Constructs an <code>IllegalThreadStateException</code> with the
+     * Constructs an {@code IllegalThreadStateException} with the
      * specified detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/IncompatibleClassChangeError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/IncompatibleClassChangeError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -39,7 +39,7 @@
     private static final long serialVersionUID = -4914975503642802119L;
 
     /**
-     * Constructs an <code>IncompatibleClassChangeError</code> with no
+     * Constructs an {@code IncompatibleClassChangeError} with no
      * detail message.
      */
     public IncompatibleClassChangeError () {
@@ -47,7 +47,7 @@
     }
 
     /**
-     * Constructs an <code>IncompatibleClassChangeError</code> with the
+     * Constructs an {@code IncompatibleClassChangeError} with the
      * specified detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/InstantiationError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/InstantiationError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -26,7 +26,7 @@
 package java.lang;
 
 /**
- * Thrown when an application tries to use the Java <code>new</code>
+ * Thrown when an application tries to use the Java {@code new}
  * construct to instantiate an abstract class or an interface.
  * <p>
  * Normally, this error is caught by the compiler; this error can
@@ -44,14 +44,14 @@
     private static final long serialVersionUID = -4885810657349421204L;
 
     /**
-     * Constructs an <code>InstantiationError</code> with no detail  message.
+     * Constructs an {@code InstantiationError} with no detail  message.
      */
     public InstantiationError() {
         super();
     }
 
     /**
-     * Constructs an <code>InstantiationError</code> with the specified
+     * Constructs an {@code InstantiationError} with the specified
      * detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/InternalError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/InternalError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,14 +36,14 @@
     private static final long serialVersionUID = -9062593416125562365L;
 
     /**
-     * Constructs an <code>InternalError</code> with no detail message.
+     * Constructs an {@code InternalError} with no detail message.
      */
     public InternalError() {
         super();
     }
 
     /**
-     * Constructs an <code>InternalError</code> with the specified
+     * Constructs an {@code InternalError} with the specified
      * detail message.
      *
      * @param   message   the detail message.
--- a/src/java.base/share/classes/java/lang/InterruptedException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/InterruptedException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -52,14 +52,14 @@
     private static final long serialVersionUID = 6700697376100628473L;
 
     /**
-     * Constructs an <code>InterruptedException</code> with no detail  message.
+     * Constructs an {@code InterruptedException} with no detail  message.
      */
     public InterruptedException() {
         super();
     }
 
     /**
-     * Constructs an <code>InterruptedException</code> with the
+     * Constructs an {@code InterruptedException} with the
      * specified detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/NegativeArraySizeException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/NegativeArraySizeException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -37,7 +37,7 @@
     private static final long serialVersionUID = -8960118058596991861L;
 
     /**
-     * Constructs a <code>NegativeArraySizeException</code> with no
+     * Constructs a {@code NegativeArraySizeException} with no
      * detail message.
      */
     public NegativeArraySizeException() {
@@ -45,7 +45,7 @@
     }
 
     /**
-     * Constructs a <code>NegativeArraySizeException</code> with the
+     * Constructs a {@code NegativeArraySizeException} with the
      * specified detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/NoClassDefFoundError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/NoClassDefFoundError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -26,9 +26,9 @@
 package java.lang;
 
 /**
- * Thrown if the Java Virtual Machine or a <code>ClassLoader</code> instance
+ * Thrown if the Java Virtual Machine or a {@code ClassLoader} instance
  * tries to load in the definition of a class (as part of a normal method call
- * or as part of creating a new instance using the <code>new</code> expression)
+ * or as part of creating a new instance using the {@code new} expression)
  * and no definition of the class could be found.
  * <p>
  * The searched-for class definition existed when the currently
@@ -44,14 +44,14 @@
     private static final long serialVersionUID = 9095859863287012458L;
 
     /**
-     * Constructs a <code>NoClassDefFoundError</code> with no detail message.
+     * Constructs a {@code NoClassDefFoundError} with no detail message.
      */
     public NoClassDefFoundError() {
         super();
     }
 
     /**
-     * Constructs a <code>NoClassDefFoundError</code> with the specified
+     * Constructs a {@code NoClassDefFoundError} with the specified
      * detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/NoSuchFieldError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/NoSuchFieldError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -42,14 +42,14 @@
     private static final long serialVersionUID = -3456430195886129035L;
 
     /**
-     * Constructs a <code>NoSuchFieldError</code> with no detail message.
+     * Constructs a {@code NoSuchFieldError} with no detail message.
      */
     public NoSuchFieldError() {
         super();
     }
 
     /**
-     * Constructs a <code>NoSuchFieldError</code> with the specified
+     * Constructs a {@code NoSuchFieldError} with the specified
      * detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/NoSuchMethodError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/NoSuchMethodError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -43,14 +43,14 @@
     private static final long serialVersionUID = -3765521442372831335L;
 
     /**
-     * Constructs a <code>NoSuchMethodError</code> with no detail message.
+     * Constructs a {@code NoSuchMethodError} with no detail message.
      */
     public NoSuchMethodError() {
         super();
     }
 
     /**
-     * Constructs a <code>NoSuchMethodError</code> with the
+     * Constructs a {@code NoSuchMethodError} with the
      * specified detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/NoSuchMethodException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/NoSuchMethodException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -37,14 +37,14 @@
     private static final long serialVersionUID = 5034388446362600923L;
 
     /**
-     * Constructs a <code>NoSuchMethodException</code> without a detail message.
+     * Constructs a {@code NoSuchMethodException} without a detail message.
      */
     public NoSuchMethodException() {
         super();
     }
 
     /**
-     * Constructs a <code>NoSuchMethodException</code> with a detail message.
+     * Constructs a {@code NoSuchMethodException} with a detail message.
      *
      * @param      s   the detail message.
      */
--- a/src/java.base/share/classes/java/lang/NumberFormatException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/NumberFormatException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -40,14 +40,14 @@
     static final long serialVersionUID = -2848938806368998894L;
 
     /**
-     * Constructs a <code>NumberFormatException</code> with no detail message.
+     * Constructs a {@code NumberFormatException} with no detail message.
      */
     public NumberFormatException () {
         super();
     }
 
     /**
-     * Constructs a <code>NumberFormatException</code> with the
+     * Constructs a {@code NumberFormatException} with the
      * specified detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/Runnable.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/Runnable.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,23 +26,23 @@
 package java.lang;
 
 /**
- * The <code>Runnable</code> interface should be implemented by any
+ * The {@code Runnable} interface should be implemented by any
  * class whose instances are intended to be executed by a thread. The
- * class must define a method of no arguments called <code>run</code>.
+ * class must define a method of no arguments called {@code run}.
  * <p>
  * This interface is designed to provide a common protocol for objects that
  * wish to execute code while they are active. For example,
- * <code>Runnable</code> is implemented by class <code>Thread</code>.
+ * {@code Runnable} is implemented by class {@code Thread}.
  * Being active simply means that a thread has been started and has not
  * yet been stopped.
  * <p>
- * In addition, <code>Runnable</code> provides the means for a class to be
- * active while not subclassing <code>Thread</code>. A class that implements
- * <code>Runnable</code> can run without subclassing <code>Thread</code>
- * by instantiating a <code>Thread</code> instance and passing itself in
- * as the target.  In most cases, the <code>Runnable</code> interface should
- * be used if you are only planning to override the <code>run()</code>
- * method and no other <code>Thread</code> methods.
+ * In addition, {@code Runnable} provides the means for a class to be
+ * active while not subclassing {@code Thread}. A class that implements
+ * {@code Runnable} can run without subclassing {@code Thread}
+ * by instantiating a {@code Thread} instance and passing itself in
+ * as the target.  In most cases, the {@code Runnable} interface should
+ * be used if you are only planning to override the {@code run()}
+ * method and no other {@code Thread} methods.
  * This is important because classes should not be subclassed
  * unless the programmer intends on modifying or enhancing the fundamental
  * behavior of the class.
@@ -55,12 +55,12 @@
 @FunctionalInterface
 public interface Runnable {
     /**
-     * When an object implementing interface <code>Runnable</code> is used
+     * When an object implementing interface {@code Runnable} is used
      * to create a thread, starting the thread causes the object's
-     * <code>run</code> method to be called in that separately executing
+     * {@code run} method to be called in that separately executing
      * thread.
      * <p>
-     * The general contract of the method <code>run</code> is that it may
+     * The general contract of the method {@code run} is that it may
      * take any action whatsoever.
      *
      * @see     java.lang.Thread#run()
--- a/src/java.base/share/classes/java/lang/RuntimePermission.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/RuntimePermission.java	Tue Sep 24 09:43:43 2019 +0100
@@ -180,7 +180,7 @@
  *
  * <tr>
  *   <th scope="row">stopThread</th>
- *   <td>Stopping of threads via calls to the Thread <code>stop</code>
+ *   <td>Stopping of threads via calls to the Thread {@code stop}
  * method</td>
  *   <td>This allows code to stop any thread in the system provided that it is
  * already granted permission to access that thread.
@@ -191,9 +191,9 @@
  * <tr>
  *   <th scope="row">modifyThreadGroup</th>
  *   <td>modification of thread groups, e.g., via calls to ThreadGroup
- * <code>destroy</code>, <code>getParent</code>, <code>resume</code>,
- * <code>setDaemon</code>, <code>setMaxPriority</code>, <code>stop</code>,
- * and <code>suspend</code> methods</td>
+ * {@code destroy}, {@code getParent}, {@code resume},
+ * {@code setDaemon}, {@code setMaxPriority}, {@code stop},
+ * and {@code suspend} methods</td>
  *   <td>This allows an attacker to create thread groups and
  * set their run priority.</td>
  * </tr>
@@ -246,8 +246,8 @@
  * <tr>
  *   <th scope="row">accessClassInPackage.{package name}</th>
  *   <td>Access to the specified package via a class loader's
- * <code>loadClass</code> method when that class loader calls
- * the SecurityManager <code>checkPackageAccess</code> method</td>
+ * {@code loadClass} method when that class loader calls
+ * the SecurityManager {@code checkPackageAccess} method</td>
  *   <td>This gives code access to classes in packages
  * to which it normally does not have access. Malicious code
  * may use these classes to help in its attempt to compromise
@@ -257,12 +257,12 @@
  * <tr>
  *   <th scope="row">defineClassInPackage.{package name}</th>
  *   <td>Definition of classes in the specified package, via a class
- * loader's <code>defineClass</code> method when that class loader calls
- * the SecurityManager <code>checkPackageDefinition</code> method.</td>
+ * loader's {@code defineClass} method when that class loader calls
+ * the SecurityManager {@code checkPackageDefinition} method.</td>
  *   <td>This grants code permission to define a class
  * in a particular package. This is dangerous because malicious
  * code with this permission may define rogue classes in
- * trusted packages like <code>java.security</code> or <code>java.lang</code>,
+ * trusted packages like {@code java.security} or {@code java.lang},
  * for example.</td>
  * </tr>
  *
@@ -412,8 +412,8 @@
      *
      * @param name the name of the RuntimePermission.
      *
-     * @throws NullPointerException if <code>name</code> is <code>null</code>.
-     * @throws IllegalArgumentException if <code>name</code> is empty.
+     * @throws NullPointerException if {@code name} is {@code null}.
+     * @throws IllegalArgumentException if {@code name} is empty.
      */
 
     public RuntimePermission(String name)
@@ -429,8 +429,8 @@
      * @param name the name of the RuntimePermission.
      * @param actions should be null.
      *
-     * @throws NullPointerException if <code>name</code> is <code>null</code>.
-     * @throws IllegalArgumentException if <code>name</code> is empty.
+     * @throws NullPointerException if {@code name} is {@code null}.
+     * @throws IllegalArgumentException if {@code name} is empty.
      */
 
     public RuntimePermission(String name, String actions)
--- a/src/java.base/share/classes/java/lang/SecurityManager.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/SecurityManager.java	Tue Sep 24 09:43:43 2019 +0100
@@ -60,11 +60,11 @@
  * operation to be performed. The
  * application can allow or disallow the operation.
  * <p>
- * The <code>SecurityManager</code> class contains many methods with
- * names that begin with the word <code>check</code>. These methods
+ * The {@code SecurityManager} class contains many methods with
+ * names that begin with the word {@code check}. These methods
  * are called by various methods in the Java libraries before those
  * methods perform certain potentially sensitive operations. The
- * invocation of such a <code>check</code> method typically looks like this:
+ * invocation of such a {@code check} method typically looks like this:
  * <blockquote><pre>
  *     SecurityManager security = System.getSecurityManager();
  *     if (security != null) {
@@ -75,7 +75,7 @@
  * The security manager is thereby given an opportunity to prevent
  * completion of the operation by throwing an exception. A security
  * manager routine simply returns if the operation is permitted, but
- * throws a <code>SecurityException</code> if the operation is not
+ * throws a {@code SecurityException} if the operation is not
  * permitted.
  * <p>
  * Environments using a security manager will typically set the security
@@ -185,16 +185,16 @@
  *
  * <p>
  * If a requested access is allowed,
- * <code>checkPermission</code> returns quietly. If denied, a
- * <code>SecurityException</code> is thrown.
+ * {@code checkPermission} returns quietly. If denied, a
+ * {@code SecurityException} is thrown.
  * <p>
  * The default implementation of each of the other
- * <code>check</code> methods in <code>SecurityManager</code> is to
- * call the <code>SecurityManager checkPermission</code> method
+ * {@code check} methods in {@code SecurityManager} is to
+ * call the {@code SecurityManager checkPermission} method
  * to determine if the calling thread has permission to perform the requested
  * operation.
  * <p>
- * Note that the <code>checkPermission</code> method with
+ * Note that the {@code checkPermission} method with
  * just a single permission argument always performs security checks
  * within the context of the currently executing thread.
  * Sometimes a security check that should be made within a given context
@@ -205,7 +205,7 @@
  * java.lang.Object) checkPermission}
  * method that includes a context argument are provided
  * for this situation. The
- * <code>getSecurityContext</code> method returns a "snapshot"
+ * {@code getSecurityContext} method returns a "snapshot"
  * of the current calling context. (The default implementation
  * returns an AccessControlContext object.) A sample call is
  * the following:
@@ -217,14 +217,14 @@
  * </pre>
  *
  * <p>
- * The <code>checkPermission</code> method
+ * The {@code checkPermission} method
  * that takes a context object in addition to a permission
  * makes access decisions based on that context,
  * rather than on that of the current execution thread.
  * Code within a different context can thus call that method,
  * passing the permission and the
  * previously-saved context object. A sample call, using the
- * SecurityManager <code>sm</code> obtained as in the previous example,
+ * SecurityManager {@code sm} obtained as in the previous example,
  * is the following:
  *
  * <pre>
@@ -234,21 +234,21 @@
  * <p>Permissions fall into these categories: File, Socket, Net,
  * Security, Runtime, Property, AWT, Reflect, and Serializable.
  * The classes managing these various
- * permission categories are <code>java.io.FilePermission</code>,
- * <code>java.net.SocketPermission</code>,
- * <code>java.net.NetPermission</code>,
- * <code>java.security.SecurityPermission</code>,
- * <code>java.lang.RuntimePermission</code>,
- * <code>java.util.PropertyPermission</code>,
- * <code>java.awt.AWTPermission</code>,
- * <code>java.lang.reflect.ReflectPermission</code>, and
- * <code>java.io.SerializablePermission</code>.
+ * permission categories are {@code java.io.FilePermission},
+ * {@code java.net.SocketPermission},
+ * {@code java.net.NetPermission},
+ * {@code java.security.SecurityPermission},
+ * {@code java.lang.RuntimePermission},
+ * {@code java.util.PropertyPermission},
+ * {@code java.awt.AWTPermission},
+ * {@code java.lang.reflect.ReflectPermission}, and
+ * {@code java.io.SerializablePermission}.
  *
  * <p>All but the first two (FilePermission and SocketPermission) are
- * subclasses of <code>java.security.BasicPermission</code>, which itself
+ * subclasses of {@code java.security.BasicPermission}, which itself
  * is an abstract subclass of the
  * top-level class for permissions, which is
- * <code>java.security.Permission</code>. BasicPermission defines the
+ * {@code java.security.Permission}. BasicPermission defines the
  * functionality needed for all permissions that contain a name
  * that follows the hierarchical property naming convention
  * (for example, "exitVM", "setFactory", "queuePrintJob", etc).
@@ -259,16 +259,16 @@
  *
  * <p>FilePermission and SocketPermission are subclasses of the
  * top-level class for permissions
- * (<code>java.security.Permission</code>). Classes like these
+ * ({@code java.security.Permission}). Classes like these
  * that have a more complicated name syntax than that used by
  * BasicPermission subclass directly from Permission rather than from
  * BasicPermission. For example,
- * for a <code>java.io.FilePermission</code> object, the permission name is
+ * for a {@code java.io.FilePermission} object, the permission name is
  * the path name of a file (or directory).
  *
  * <p>Some of the permission classes have an "actions" list that tells
  * the actions that are permitted for the object.  For example,
- * for a <code>java.io.FilePermission</code> object, the actions list
+ * for a {@code java.io.FilePermission} object, the actions list
  * (such as "read, write") specifies which actions are granted for the
  * specified file (or for files in the specified directory).
  *
@@ -276,7 +276,7 @@
  * ones that contain a name but no actions list; you either have the
  * named permission or you don't.
  *
- * <p>Note: There is also a <code>java.security.AllPermission</code>
+ * <p>Note: There is also a {@code java.security.AllPermission}
  * permission that implies all permissions. It exists to simplify the work
  * of system administrators who might need to perform multiple
  * tasks that require all (or numerous) permissions.
@@ -285,7 +285,7 @@
  * Permissions in the Java Development Kit (JDK)}
  * for permission-related information.
  * This document includes a table listing the various SecurityManager
- * <code>check</code> methods and the permission(s) the default
+ * {@code check} methods and the permission(s) the default
  * implementation of each such method requires.
  * It also contains a table of the methods
  * that require permissions, and for each such method tells
@@ -322,17 +322,17 @@
     private boolean initialized = false;
 
     /**
-     * Constructs a new <code>SecurityManager</code>.
+     * Constructs a new {@code SecurityManager}.
      *
      * <p> If there is a security manager already installed, this method first
-     * calls the security manager's <code>checkPermission</code> method
-     * with the <code>RuntimePermission("createSecurityManager")</code>
+     * calls the security manager's {@code checkPermission} method
+     * with the {@code RuntimePermission("createSecurityManager")}
      * permission to ensure the calling thread has permission to create a new
      * security manager.
-     * This may result in throwing a <code>SecurityException</code>.
+     * This may result in throwing a {@code SecurityException}.
      *
      * @throws     java.lang.SecurityException if a security manager already
-     *             exists and its <code>checkPermission</code> method
+     *             exists and its {@code checkPermission} method
      *             doesn't allow creation of a new security manager.
      * @see        java.lang.System#getSecurityManager()
      * @see        #checkPermission(java.security.Permission) checkPermission
@@ -355,8 +355,8 @@
      * Returns the current execution stack as an array of classes.
      * <p>
      * The length of the array is the number of methods on the execution
-     * stack. The element at index <code>0</code> is the class of the
-     * currently executing method, the element at index <code>1</code> is
+     * stack. The element at index {@code 0} is the class of the
+     * currently executing method, the element at index {@code 1} is
      * the class of that method's caller, and so on.
      *
      * @return  the execution stack.
@@ -366,15 +366,15 @@
     /**
      * Creates an object that encapsulates the current execution
      * environment. The result of this method is used, for example, by the
-     * three-argument <code>checkConnect</code> method and by the
-     * two-argument <code>checkRead</code> method.
+     * three-argument {@code checkConnect} method and by the
+     * two-argument {@code checkRead} method.
      * These methods are needed because a trusted method may be called
      * on to read a file or open a socket on behalf of another method.
      * The trusted method needs to determine if the other (possibly
      * untrusted) method would be allowed to perform the operation on its
      * own.
      * <p> The default implementation of this method is to return
-     * an <code>AccessControlContext</code> object.
+     * an {@code AccessControlContext} object.
      *
      * @return  an implementation-dependent object that encapsulates
      *          sufficient information about the current execution environment
@@ -390,18 +390,18 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the requested
+     * Throws a {@code SecurityException} if the requested
      * access, specified by the given permission, is not permitted based
      * on the security policy currently in effect.
      * <p>
-     * This method calls <code>AccessController.checkPermission</code>
+     * This method calls {@code AccessController.checkPermission}
      * with the given permission.
      *
      * @param     perm   the requested permission.
      * @throws    SecurityException if access is not permitted based on
      *            the current security policy.
      * @throws    NullPointerException if the permission argument is
-     *            <code>null</code>.
+     *            {@code null}.
      * @since     1.2
      */
     public void checkPermission(Permission perm) {
@@ -409,32 +409,32 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * specified security context is denied access to the resource
      * specified by the given permission.
      * The context must be a security
      * context returned by a previous call to
-     * <code>getSecurityContext</code> and the access control
+     * {@code getSecurityContext} and the access control
      * decision is based upon the configured security policy for
      * that security context.
      * <p>
-     * If <code>context</code> is an instance of
-     * <code>AccessControlContext</code> then the
-     * <code>AccessControlContext.checkPermission</code> method is
+     * If {@code context} is an instance of
+     * {@code AccessControlContext} then the
+     * {@code AccessControlContext.checkPermission} method is
      * invoked with the specified permission.
      * <p>
-     * If <code>context</code> is not an instance of
-     * <code>AccessControlContext</code> then a
-     * <code>SecurityException</code> is thrown.
+     * If {@code context} is not an instance of
+     * {@code AccessControlContext} then a
+     * {@code SecurityException} is thrown.
      *
      * @param      perm      the specified permission
      * @param      context   a system-dependent security context.
      * @throws     SecurityException  if the specified security context
-     *             is not an instance of <code>AccessControlContext</code>
-     *             (e.g., is <code>null</code>), or is denied access to the
+     *             is not an instance of {@code AccessControlContext}
+     *             (e.g., is {@code null}), or is denied access to the
      *             resource specified by the given permission.
      * @throws     NullPointerException if the permission argument is
-     *             <code>null</code>.
+     *             {@code null}.
      * @see        java.lang.SecurityManager#getSecurityContext()
      * @see java.security.AccessControlContext#checkPermission(java.security.Permission)
      * @since      1.2
@@ -448,15 +448,15 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to create a new class loader.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>RuntimePermission("createClassLoader")</code>
+     * This method calls {@code checkPermission} with the
+     * {@code RuntimePermission("createClassLoader")}
      * permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkCreateClassLoader</code>
+     * {@code super.checkCreateClassLoader}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -486,31 +486,31 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to modify the thread argument.
      * <p>
      * This method is invoked for the current security manager by the
-     * <code>stop</code>, <code>suspend</code>, <code>resume</code>,
-     * <code>setPriority</code>, <code>setName</code>, and
-     * <code>setDaemon</code> methods of class <code>Thread</code>.
+     * {@code stop}, {@code suspend}, {@code resume},
+     * {@code setPriority}, {@code setName}, and
+     * {@code setDaemon} methods of class {@code Thread}.
      * <p>
      * If the thread argument is a system thread (belongs to
-     * the thread group with a <code>null</code> parent) then
-     * this method calls <code>checkPermission</code> with the
-     * <code>RuntimePermission("modifyThread")</code> permission.
+     * the thread group with a {@code null} parent) then
+     * this method calls {@code checkPermission} with the
+     * {@code RuntimePermission("modifyThread")} permission.
      * If the thread argument is <i>not</i> a system thread,
      * this method just returns silently.
      * <p>
      * Applications that want a stricter policy should override this
      * method. If this method is overridden, the method that overrides
      * it should additionally check to see if the calling thread has the
-     * <code>RuntimePermission("modifyThread")</code> permission, and
+     * {@code RuntimePermission("modifyThread")} permission, and
      * if so, return silently. This is to ensure that code granted
      * that permission (such as the JDK itself) is allowed to
      * manipulate any thread.
      * <p>
      * If this method is overridden, then
-     * <code>super.checkAccess</code> should
+     * {@code super.checkAccess} should
      * be called by the first statement in the overridden method, or the
      * equivalent security check should be placed in the overridden method.
      *
@@ -518,7 +518,7 @@
      * @throws     SecurityException  if the calling thread does not have
      *             permission to modify the thread.
      * @throws     NullPointerException if the thread argument is
-     *             <code>null</code>.
+     *             {@code null}.
      * @see        java.lang.Thread#resume() resume
      * @see        java.lang.Thread#setDaemon(boolean) setDaemon
      * @see        java.lang.Thread#setName(java.lang.String) setName
@@ -538,32 +538,32 @@
         }
     }
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to modify the thread group argument.
      * <p>
      * This method is invoked for the current security manager when a
      * new child thread or child thread group is created, and by the
-     * <code>setDaemon</code>, <code>setMaxPriority</code>,
-     * <code>stop</code>, <code>suspend</code>, <code>resume</code>, and
-     * <code>destroy</code> methods of class <code>ThreadGroup</code>.
+     * {@code setDaemon}, {@code setMaxPriority},
+     * {@code stop}, {@code suspend}, {@code resume}, and
+     * {@code destroy} methods of class {@code ThreadGroup}.
      * <p>
      * If the thread group argument is the system thread group (
-     * has a <code>null</code> parent) then
-     * this method calls <code>checkPermission</code> with the
-     * <code>RuntimePermission("modifyThreadGroup")</code> permission.
+     * has a {@code null} parent) then
+     * this method calls {@code checkPermission} with the
+     * {@code RuntimePermission("modifyThreadGroup")} permission.
      * If the thread group argument is <i>not</i> the system thread group,
      * this method just returns silently.
      * <p>
      * Applications that want a stricter policy should override this
      * method. If this method is overridden, the method that overrides
      * it should additionally check to see if the calling thread has the
-     * <code>RuntimePermission("modifyThreadGroup")</code> permission, and
+     * {@code RuntimePermission("modifyThreadGroup")} permission, and
      * if so, return silently. This is to ensure that code granted
      * that permission (such as the JDK itself) is allowed to
      * manipulate any thread.
      * <p>
      * If this method is overridden, then
-     * <code>super.checkAccess</code> should
+     * {@code super.checkAccess} should
      * be called by the first statement in the overridden method, or the
      * equivalent security check should be placed in the overridden method.
      *
@@ -571,7 +571,7 @@
      * @throws     SecurityException  if the calling thread does not have
      *             permission to modify the thread group.
      * @throws     NullPointerException if the thread group argument is
-     *             <code>null</code>.
+     *             {@code null}.
      * @see        java.lang.ThreadGroup#destroy() destroy
      * @see        java.lang.ThreadGroup#resume() resume
      * @see        java.lang.ThreadGroup#setDaemon(boolean) setDaemon
@@ -592,20 +592,20 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to cause the Java Virtual Machine to
      * halt with the specified status code.
      * <p>
      * This method is invoked for the current security manager by the
-     * <code>exit</code> method of class <code>Runtime</code>. A status
-     * of <code>0</code> indicates success; other values indicate various
+     * {@code exit} method of class {@code Runtime}. A status
+     * of {@code 0} indicates success; other values indicate various
      * errors.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>RuntimePermission("exitVM."+status)</code> permission.
+     * This method calls {@code checkPermission} with the
+     * {@code RuntimePermission("exitVM."+status)} permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkExit</code>
+     * {@code super.checkExit}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -621,28 +621,28 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to create a subprocess.
      * <p>
      * This method is invoked for the current security manager by the
-     * <code>exec</code> methods of class <code>Runtime</code>.
+     * {@code exec} methods of class {@code Runtime}.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>FilePermission(cmd,"execute")</code> permission
+     * This method calls {@code checkPermission} with the
+     * {@code FilePermission(cmd,"execute")} permission
      * if cmd is an absolute path, otherwise it calls
-     * <code>checkPermission</code> with
+     * {@code checkPermission} with
      * <code>FilePermission("&lt;&lt;ALL FILES&gt;&gt;","execute")</code>.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkExec</code>
+     * {@code super.checkExec}
      * at the point the overridden method would normally throw an
      * exception.
      *
      * @param      cmd   the specified system command.
      * @throws     SecurityException if the calling thread does not have
      *             permission to create a subprocess.
-     * @throws     NullPointerException if the <code>cmd</code> argument is
-     *             <code>null</code>.
+     * @throws     NullPointerException if the {@code cmd} argument is
+     *             {@code null}.
      * @see     java.lang.Runtime#exec(java.lang.String)
      * @see     java.lang.Runtime#exec(java.lang.String, java.lang.String[])
      * @see     java.lang.Runtime#exec(java.lang.String[])
@@ -661,28 +661,28 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to dynamic link the library code
      * specified by the string argument file. The argument is either a
      * simple library name or a complete filename.
      * <p>
      * This method is invoked for the current security manager by
-     * methods <code>load</code> and <code>loadLibrary</code> of class
-     * <code>Runtime</code>.
+     * methods {@code load} and {@code loadLibrary} of class
+     * {@code Runtime}.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>RuntimePermission("loadLibrary."+lib)</code> permission.
+     * This method calls {@code checkPermission} with the
+     * {@code RuntimePermission("loadLibrary."+lib)} permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkLink</code>
+     * {@code super.checkLink}
      * at the point the overridden method would normally throw an
      * exception.
      *
      * @param      lib   the name of the library.
      * @throws     SecurityException if the calling thread does not have
      *             permission to dynamically link the library.
-     * @throws     NullPointerException if the <code>lib</code> argument is
-     *             <code>null</code>.
+     * @throws     NullPointerException if the {@code lib} argument is
+     *             {@code null}.
      * @see        java.lang.Runtime#load(java.lang.String)
      * @see        java.lang.Runtime#loadLibrary(java.lang.String)
      * @see        #checkPermission(java.security.Permission) checkPermission
@@ -695,16 +695,16 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to read from the specified file
      * descriptor.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>RuntimePermission("readFileDescriptor")</code>
+     * This method calls {@code checkPermission} with the
+     * {@code RuntimePermission("readFileDescriptor")}
      * permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkRead</code>
+     * {@code super.checkRead}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -712,7 +712,7 @@
      * @throws     SecurityException  if the calling thread does not have
      *             permission to access the specified file descriptor.
      * @throws     NullPointerException if the file descriptor argument is
-     *             <code>null</code>.
+     *             {@code null}.
      * @see        java.io.FileDescriptor
      * @see        #checkPermission(java.security.Permission) checkPermission
      */
@@ -724,23 +724,23 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to read the file specified by the
      * string argument.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>FilePermission(file,"read")</code> permission.
+     * This method calls {@code checkPermission} with the
+     * {@code FilePermission(file,"read")} permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkRead</code>
+     * {@code super.checkRead}
      * at the point the overridden method would normally throw an
      * exception.
      *
      * @param      file   the system-dependent file name.
      * @throws     SecurityException if the calling thread does not have
      *             permission to access the specified file.
-     * @throws     NullPointerException if the <code>file</code> argument is
-     *             <code>null</code>.
+     * @throws     NullPointerException if the {@code file} argument is
+     *             {@code null}.
      * @see        #checkPermission(java.security.Permission) checkPermission
      */
     public void checkRead(String file) {
@@ -749,32 +749,32 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * specified security context is not allowed to read the file
      * specified by the string argument. The context must be a security
      * context returned by a previous call to
-     * <code>getSecurityContext</code>.
-     * <p> If <code>context</code> is an instance of
-     * <code>AccessControlContext</code> then the
-     * <code>AccessControlContext.checkPermission</code> method will
-     * be invoked with the <code>FilePermission(file,"read")</code> permission.
-     * <p> If <code>context</code> is not an instance of
-     * <code>AccessControlContext</code> then a
-     * <code>SecurityException</code> is thrown.
+     * {@code getSecurityContext}.
+     * <p> If {@code context} is an instance of
+     * {@code AccessControlContext} then the
+     * {@code AccessControlContext.checkPermission} method will
+     * be invoked with the {@code FilePermission(file,"read")} permission.
+     * <p> If {@code context} is not an instance of
+     * {@code AccessControlContext} then a
+     * {@code SecurityException} is thrown.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkRead</code>
+     * {@code super.checkRead}
      * at the point the overridden method would normally throw an
      * exception.
      *
      * @param      file      the system-dependent filename.
      * @param      context   a system-dependent security context.
      * @throws     SecurityException  if the specified security context
-     *             is not an instance of <code>AccessControlContext</code>
-     *             (e.g., is <code>null</code>), or does not have permission
+     *             is not an instance of {@code AccessControlContext}
+     *             (e.g., is {@code null}), or does not have permission
      *             to read the specified file.
-     * @throws     NullPointerException if the <code>file</code> argument is
-     *             <code>null</code>.
+     * @throws     NullPointerException if the {@code file} argument is
+     *             {@code null}.
      * @see        java.lang.SecurityManager#getSecurityContext()
      * @see        java.security.AccessControlContext#checkPermission(java.security.Permission)
      */
@@ -785,16 +785,16 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to write to the specified file
      * descriptor.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>RuntimePermission("writeFileDescriptor")</code>
+     * This method calls {@code checkPermission} with the
+     * {@code RuntimePermission("writeFileDescriptor")}
      * permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkWrite</code>
+     * {@code super.checkWrite}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -802,7 +802,7 @@
      * @throws    SecurityException  if the calling thread does not have
      *             permission to access the specified file descriptor.
      * @throws     NullPointerException if the file descriptor argument is
-     *             <code>null</code>.
+     *             {@code null}.
      * @see        java.io.FileDescriptor
      * @see        #checkPermission(java.security.Permission) checkPermission
      */
@@ -815,23 +815,23 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to write to the file specified by
      * the string argument.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>FilePermission(file,"write")</code> permission.
+     * This method calls {@code checkPermission} with the
+     * {@code FilePermission(file,"write")} permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkWrite</code>
+     * {@code super.checkWrite}
      * at the point the overridden method would normally throw an
      * exception.
      *
      * @param      file   the system-dependent filename.
      * @throws     SecurityException  if the calling thread does not
      *             have permission to access the specified file.
-     * @throws     NullPointerException if the <code>file</code> argument is
-     *             <code>null</code>.
+     * @throws     NullPointerException if the {@code file} argument is
+     *             {@code null}.
      * @see        #checkPermission(java.security.Permission) checkPermission
      */
     public void checkWrite(String file) {
@@ -840,25 +840,25 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to delete the specified file.
      * <p>
      * This method is invoked for the current security manager by the
-     * <code>delete</code> method of class <code>File</code>.
+     * {@code delete} method of class {@code File}.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>FilePermission(file,"delete")</code> permission.
+     * This method calls {@code checkPermission} with the
+     * {@code FilePermission(file,"delete")} permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkDelete</code>
+     * {@code super.checkDelete}
      * at the point the overridden method would normally throw an
      * exception.
      *
      * @param      file   the system-dependent filename.
      * @throws     SecurityException if the calling thread does not
      *             have permission to delete the file.
-     * @throws     NullPointerException if the <code>file</code> argument is
-     *             <code>null</code>.
+     * @throws     NullPointerException if the {@code file} argument is
+     *             {@code null}.
      * @see        java.io.File#delete()
      * @see        #checkPermission(java.security.Permission) checkPermission
      */
@@ -868,22 +868,22 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to open a socket connection to the
      * specified host and port number.
      * <p>
-     * A port number of <code>-1</code> indicates that the calling
+     * A port number of {@code -1} indicates that the calling
      * method is attempting to determine the IP address of the specified
      * host name.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>SocketPermission(host+":"+port,"connect")</code> permission if
+     * This method calls {@code checkPermission} with the
+     * {@code SocketPermission(host+":"+port,"connect")} permission if
      * the port is not equal to -1. If the port is equal to -1, then
-     * it calls <code>checkPermission</code> with the
-     * <code>SocketPermission(host,"resolve")</code> permission.
+     * it calls {@code checkPermission} with the
+     * {@code SocketPermission(host,"resolve")} permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkConnect</code>
+     * {@code super.checkConnect}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -891,9 +891,9 @@
      * @param      port   the protocol port to connect to.
      * @throws     SecurityException  if the calling thread does not have
      *             permission to open a socket connection to the specified
-     *               <code>host</code> and <code>port</code>.
-     * @throws     NullPointerException if the <code>host</code> argument is
-     *             <code>null</code>.
+     *               {@code host} and {@code port}.
+     * @throws     NullPointerException if the {@code host} argument is
+     *             {@code null}.
      * @see        #checkPermission(java.security.Permission) checkPermission
      */
     public void checkConnect(String host, int port) {
@@ -913,28 +913,28 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * specified security context is not allowed to open a socket
      * connection to the specified host and port number.
      * <p>
-     * A port number of <code>-1</code> indicates that the calling
+     * A port number of {@code -1} indicates that the calling
      * method is attempting to determine the IP address of the specified
      * host name.
-     * <p> If <code>context</code> is not an instance of
-     * <code>AccessControlContext</code> then a
-     * <code>SecurityException</code> is thrown.
+     * <p> If {@code context} is not an instance of
+     * {@code AccessControlContext} then a
+     * {@code SecurityException} is thrown.
      * <p>
      * Otherwise, the port number is checked. If it is not equal
-     * to -1, the <code>context</code>'s <code>checkPermission</code>
+     * to -1, the {@code context}'s {@code checkPermission}
      * method is called with a
-     * <code>SocketPermission(host+":"+port,"connect")</code> permission.
+     * {@code SocketPermission(host+":"+port,"connect")} permission.
      * If the port is equal to -1, then
-     * the <code>context</code>'s <code>checkPermission</code> method
+     * the {@code context}'s {@code checkPermission} method
      * is called with a
-     * <code>SocketPermission(host,"resolve")</code> permission.
+     * {@code SocketPermission(host,"resolve")} permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkConnect</code>
+     * {@code super.checkConnect}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -942,12 +942,12 @@
      * @param      port      the protocol port to connect to.
      * @param      context   a system-dependent security context.
      * @throws     SecurityException if the specified security context
-     *             is not an instance of <code>AccessControlContext</code>
-     *             (e.g., is <code>null</code>), or does not have permission
+     *             is not an instance of {@code AccessControlContext}
+     *             (e.g., is {@code null}), or does not have permission
      *             to open a socket connection to the specified
-     *             <code>host</code> and <code>port</code>.
-     * @throws     NullPointerException if the <code>host</code> argument is
-     *             <code>null</code>.
+     *             {@code host} and {@code port}.
+     * @throws     NullPointerException if the {@code host} argument is
+     *             {@code null}.
      * @see        java.lang.SecurityManager#getSecurityContext()
      * @see        java.security.AccessControlContext#checkPermission(java.security.Permission)
      */
@@ -969,15 +969,15 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to wait for a connection request on
      * the specified local port number.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>SocketPermission("localhost:"+port,"listen")</code>.
+     * This method calls {@code checkPermission} with the
+     * {@code SocketPermission("localhost:"+port,"listen")}.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkListen</code>
+     * {@code super.checkListen}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -992,18 +992,18 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not permitted to accept a socket connection from
      * the specified host and port number.
      * <p>
      * This method is invoked for the current security manager by the
-     * <code>accept</code> method of class <code>ServerSocket</code>.
+     * {@code accept} method of class {@code ServerSocket}.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>SocketPermission(host+":"+port,"accept")</code> permission.
+     * This method calls {@code checkPermission} with the
+     * {@code SocketPermission(host+":"+port,"accept")} permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkAccept</code>
+     * {@code super.checkAccept}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -1011,8 +1011,8 @@
      * @param      port   the port number of the socket connection.
      * @throws     SecurityException  if the calling thread does not have
      *             permission to accept the connection.
-     * @throws     NullPointerException if the <code>host</code> argument is
-     *             <code>null</code>.
+     * @throws     NullPointerException if the {@code host} argument is
+     *             {@code null}.
      * @see        java.net.ServerSocket#accept()
      * @see        #checkPermission(java.security.Permission) checkPermission
      */
@@ -1028,16 +1028,16 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to use
      * (join/leave/send/receive) IP multicast.
      * <p>
-     * This method calls <code>checkPermission</code> with the
+     * This method calls {@code checkPermission} with the
      * <code>java.net.SocketPermission(maddr.getHostAddress(),
      * "accept,connect")</code> permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkMulticast</code>
+     * {@code super.checkMulticast}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -1045,7 +1045,7 @@
      * @throws     SecurityException  if the calling thread is not allowed to
      *  use (join/leave/send/receive) IP multicast.
      * @throws     NullPointerException if the address argument is
-     *             <code>null</code>.
+     *             {@code null}.
      * @since      1.1
      * @see        #checkPermission(java.security.Permission) checkPermission
      */
@@ -1059,16 +1059,16 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to use
      * (join/leave/send/receive) IP multicast.
      * <p>
-     * This method calls <code>checkPermission</code> with the
+     * This method calls {@code checkPermission} with the
      * <code>java.net.SocketPermission(maddr.getHostAddress(),
      * "accept,connect")</code> permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkMulticast</code>
+     * {@code super.checkMulticast}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -1079,7 +1079,7 @@
      * @throws     SecurityException  if the calling thread is not allowed to
      *  use (join/leave/send/receive) IP multicast.
      * @throws     NullPointerException if the address argument is
-     *             <code>null</code>.
+     *             {@code null}.
      * @since      1.1
      * @deprecated Use #checkPermission(java.security.Permission) instead
      * @see        #checkPermission(java.security.Permission) checkPermission
@@ -1095,18 +1095,18 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to access or modify the system
      * properties.
      * <p>
-     * This method is used by the <code>getProperties</code> and
-     * <code>setProperties</code> methods of class <code>System</code>.
+     * This method is used by the {@code getProperties} and
+     * {@code setProperties} methods of class {@code System}.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>PropertyPermission("*", "read,write")</code> permission.
+     * This method calls {@code checkPermission} with the
+     * {@code PropertyPermission("*", "read,write")} permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkPropertiesAccess</code>
+     * {@code super.checkPropertiesAccess}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -1122,18 +1122,18 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to access the system property with
-     * the specified <code>key</code> name.
+     * the specified {@code key} name.
      * <p>
-     * This method is used by the <code>getProperty</code> method of
-     * class <code>System</code>.
+     * This method is used by the {@code getProperty} method of
+     * class {@code System}.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>PropertyPermission(key, "read")</code> permission.
+     * This method calls {@code checkPermission} with the
+     * {@code PropertyPermission(key, "read")} permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkPropertyAccess</code>
+     * {@code super.checkPropertyAccess}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -1141,9 +1141,9 @@
      *
      * @throws     SecurityException  if the calling thread does not have
      *             permission to access the specified system property.
-     * @throws     NullPointerException if the <code>key</code> argument is
-     *             <code>null</code>.
-     * @throws     IllegalArgumentException if <code>key</code> is empty.
+     * @throws     NullPointerException if the {@code key} argument is
+     *             {@code null}.
+     * @throws     IllegalArgumentException if {@code key} is empty.
      *
      * @see        java.lang.System#getProperty(java.lang.String)
      * @see        #checkPermission(java.security.Permission) checkPermission
@@ -1154,15 +1154,15 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to initiate a print job request.
      * <p>
      * This method calls
-     * <code>checkPermission</code> with the
-     * <code>RuntimePermission("queuePrintJob")</code> permission.
+     * {@code checkPermission} with the
+     * {@code RuntimePermission("queuePrintJob")} permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkPrintJobAccess</code>
+     * {@code super.checkPrintJobAccess}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -1461,16 +1461,16 @@
     }
 
     /**
-     * Throws a <code>SecurityException</code> if the
+     * Throws a {@code SecurityException} if the
      * calling thread is not allowed to set the socket factory used by
-     * <code>ServerSocket</code> or <code>Socket</code>, or the stream
-     * handler factory used by <code>URL</code>.
+     * {@code ServerSocket} or {@code Socket}, or the stream
+     * handler factory used by {@code URL}.
      * <p>
-     * This method calls <code>checkPermission</code> with the
-     * <code>RuntimePermission("setFactory")</code> permission.
+     * This method calls {@code checkPermission} with the
+     * {@code RuntimePermission("setFactory")} permission.
      * <p>
      * If you override this method, then you should make a call to
-     * <code>super.checkSetFactory</code>
+     * {@code super.checkSetFactory}
      * at the point the overridden method would normally throw an
      * exception.
      *
@@ -1494,8 +1494,8 @@
      * <p> If the requested permission is allowed, this method returns
      * quietly. If denied, a SecurityException is raised.
      *
-     * <p> This method creates a <code>SecurityPermission</code> object for
-     * the given permission target name and calls <code>checkPermission</code>
+     * <p> This method creates a {@code SecurityPermission} object for
+     * the given permission target name and calls {@code checkPermission}
      * with it.
      *
      * <p> See the documentation for
@@ -1503,16 +1503,16 @@
      * a list of possible permission target names.
      *
      * <p> If you override this method, then you should make a call to
-     * <code>super.checkSecurityAccess</code>
+     * {@code super.checkSecurityAccess}
      * at the point the overridden method would normally throw an
      * exception.
      *
-     * @param target the target name of the <code>SecurityPermission</code>.
+     * @param target the target name of the {@code SecurityPermission}.
      *
      * @throws    SecurityException if the calling thread does not have
      * permission for the requested access.
-     * @throws    NullPointerException if <code>target</code> is null.
-     * @throws    IllegalArgumentException if <code>target</code> is empty.
+     * @throws    NullPointerException if {@code target} is null.
+     * @throws    IllegalArgumentException if {@code target} is empty.
      *
      * @since   1.1
      * @see        #checkPermission(java.security.Permission) checkPermission
--- a/src/java.base/share/classes/java/lang/StackOverflowError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/StackOverflowError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -38,14 +38,14 @@
     private static final long serialVersionUID = 8609175038441759607L;
 
     /**
-     * Constructs a <code>StackOverflowError</code> with no detail message.
+     * Constructs a {@code StackOverflowError} with no detail message.
      */
     public StackOverflowError() {
         super();
     }
 
     /**
-     * Constructs a <code>StackOverflowError</code> with the specified
+     * Constructs a {@code StackOverflowError} with the specified
      * detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/UnknownError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/UnknownError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -38,14 +38,14 @@
     private static final long serialVersionUID = 2524784860676771849L;
 
     /**
-     * Constructs an <code>UnknownError</code> with no detail message.
+     * Constructs an {@code UnknownError} with no detail message.
      */
     public UnknownError() {
         super();
     }
 
     /**
-     * Constructs an <code>UnknownError</code> with the specified detail
+     * Constructs an {@code UnknownError} with the specified detail
      * message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/UnsatisfiedLinkError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/UnsatisfiedLinkError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -27,7 +27,7 @@
 
 /**
  * Thrown if the Java Virtual Machine cannot find an appropriate
- * native-language definition of a method declared <code>native</code>.
+ * native-language definition of a method declared {@code native}.
  *
  * @author unascribed
  * @see     java.lang.Runtime
@@ -39,14 +39,14 @@
     private static final long serialVersionUID = -4019343241616879428L;
 
     /**
-     * Constructs an <code>UnsatisfiedLinkError</code> with no detail message.
+     * Constructs an {@code UnsatisfiedLinkError} with no detail message.
      */
     public UnsatisfiedLinkError() {
         super();
     }
 
     /**
-     * Constructs an <code>UnsatisfiedLinkError</code> with the
+     * Constructs an {@code UnsatisfiedLinkError} with the
      * specified detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/UnsupportedClassVersionError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/UnsupportedClassVersionError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -38,7 +38,7 @@
     private static final long serialVersionUID = -7123279212883497373L;
 
     /**
-     * Constructs a <code>UnsupportedClassVersionError</code>
+     * Constructs a {@code UnsupportedClassVersionError}
      * with no detail message.
      */
     public UnsupportedClassVersionError() {
@@ -46,7 +46,7 @@
     }
 
     /**
-     * Constructs a <code>UnsupportedClassVersionError</code> with
+     * Constructs a {@code UnsupportedClassVersionError} with
      * the specified detail message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/lang/UnsupportedOperationException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/UnsupportedOperationException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -56,7 +56,7 @@
      * Constructs a new exception with the specified detail message and
      * cause.
      *
-     * <p>Note that the detail message associated with <code>cause</code> is
+     * <p>Note that the detail message associated with {@code cause} is
      * <i>not</i> automatically incorporated in this exception's detail
      * message.
      *
--- a/src/java.base/share/classes/java/lang/VerifyError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/VerifyError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -39,14 +39,14 @@
     private static final long serialVersionUID = 7001962396098498785L;
 
     /**
-     * Constructs an <code>VerifyError</code> with no detail message.
+     * Constructs an {@code VerifyError} with no detail message.
      */
     public VerifyError() {
         super();
     }
 
     /**
-     * Constructs an <code>VerifyError</code> with the specified detail message.
+     * Constructs an {@code VerifyError} with the specified detail message.
      *
      * @param   s   the detail message.
      */
--- a/src/java.base/share/classes/java/lang/VirtualMachineError.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/VirtualMachineError.java	Tue Sep 24 09:43:43 2019 +0100
@@ -38,14 +38,14 @@
     private static final long serialVersionUID = 4161983926571568670L;
 
     /**
-     * Constructs a <code>VirtualMachineError</code> with no detail message.
+     * Constructs a {@code VirtualMachineError} with no detail message.
      */
     public VirtualMachineError() {
         super();
     }
 
     /**
-     * Constructs a <code>VirtualMachineError</code> with the specified
+     * Constructs a {@code VirtualMachineError} with the specified
      * detail message.
      *
      * @param   message   the detail message.
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1042,7 +1042,7 @@
      * <td style="text-align:center">IAE</td>
      * </tr>
      * <tr>
-     * <td>{@code ANY.in(X)}, for inaccessible <code>X</code></td>
+     * <td>{@code ANY.in(X)}, for inaccessible {@code X}</td>
      * <td></td>
      * <td></td>
      * <td></td>
--- a/src/java.base/share/classes/java/lang/invoke/package-info.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/invoke/package-info.java	Tue Sep 24 09:43:43 2019 +0100
@@ -216,22 +216,22 @@
  * <tbody>
  * <tr><th scope="row" style="font-weight:normal; vertical-align:top">*</th><td>
  *     <ul style="list-style:none; padding-left: 0; margin:0">
- *     <li><code>CallSite bootstrap(Lookup caller, String name, MethodType type, Object... args)</code>
- *     <li><code>CallSite bootstrap(Object... args)</code>
- *     <li><code>CallSite bootstrap(Object caller, Object... nameAndTypeWithArgs)</code>
+ *     <li>{@code CallSite bootstrap(Lookup caller, String name, MethodType type, Object... args)}
+ *     <li>{@code CallSite bootstrap(Object... args)}
+ *     <li>{@code CallSite bootstrap(Object caller, Object... nameAndTypeWithArgs)}
  *     </ul></td></tr>
  * <tr><th scope="row" style="font-weight:normal; vertical-align:top">0</th><td>
  *     <ul style="list-style:none; padding-left: 0; margin:0">
- *     <li><code>CallSite bootstrap(Lookup caller, String name, MethodType type)</code>
- *     <li><code>CallSite bootstrap(Lookup caller, Object... nameAndType)</code>
+ *     <li>{@code CallSite bootstrap(Lookup caller, String name, MethodType type)}
+ *     <li>{@code CallSite bootstrap(Lookup caller, Object... nameAndType)}
  *     </ul></td></tr>
  * <tr><th scope="row" style="font-weight:normal; vertical-align:top">1</th><td>
- *     <code>CallSite bootstrap(Lookup caller, String name, MethodType type, Object arg)</code></td></tr>
+ *     {@code CallSite bootstrap(Lookup caller, String name, MethodType type, Object arg)}</td></tr>
  * <tr><th scope="row" style="font-weight:normal; vertical-align:top">2</th><td>
  *     <ul style="list-style:none; padding-left: 0; margin:0">
- *     <li><code>CallSite bootstrap(Lookup caller, String name, MethodType type, Object... args)</code>
- *     <li><code>CallSite bootstrap(Lookup caller, String name, MethodType type, String... args)</code>
- *     <li><code>CallSite bootstrap(Lookup caller, String name, MethodType type, String x, int y)</code>
+ *     <li>{@code CallSite bootstrap(Lookup caller, String name, MethodType type, Object... args)}
+ *     <li>{@code CallSite bootstrap(Lookup caller, String name, MethodType type, String... args)}
+ *     <li>{@code CallSite bootstrap(Lookup caller, String name, MethodType type, String x, int y)}
  *     </ul></td></tr>
  * </tbody>
  * </table>
--- a/src/java.base/share/classes/java/lang/ref/Reference.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/lang/ref/Reference.java	Tue Sep 24 09:43:43 2019 +0100
@@ -323,10 +323,10 @@
     /**
      * Returns this reference object's referent.  If this reference object has
      * been cleared, either by the program or by the garbage collector, then
-     * this method returns <code>null</code>.
+     * this method returns {@code null}.
      *
      * @return   The object to which this reference refers, or
-     *           <code>null</code> if this reference object has been cleared
+     *           {@code null} if this reference object has been cleared
      */
     @HotSpotIntrinsicCandidate
     public T get() {
@@ -350,9 +350,9 @@
      * Tells whether or not this reference object has been enqueued, either by
      * the program or by the garbage collector.  If this reference object was
      * not registered with a queue when it was created, then this method will
-     * always return <code>false</code>.
+     * always return {@code false}.
      *
-     * @return   <code>true</code> if and only if this reference object has
+     * @return   {@code true} if and only if this reference object has
      *           been enqueued
      */
     public boolean isEnqueued() {
@@ -366,8 +366,8 @@
      * <p> This method is invoked only by Java code; when the garbage collector
      * enqueues references it does so directly, without invoking this method.
      *
-     * @return   <code>true</code> if this reference object was successfully
-     *           enqueued; <code>false</code> if it was already enqueued or if
+     * @return   {@code true} if this reference object was successfully
+     *           enqueued; {@code false} if it was already enqueued or if
      *           it was not registered with a queue when it was created
      */
     public boolean enqueue() {
--- a/src/java.base/share/classes/java/text/AttributedString.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/AttributedString.java	Tue Sep 24 09:43:43 2019 +0100
@@ -117,7 +117,7 @@
     /**
      * Constructs an AttributedString instance with the given text.
      * @param text The text for this attributed string.
-     * @throws    NullPointerException if <code>text</code> is null.
+     * @throws    NullPointerException if {@code text} is null.
      */
     public AttributedString(String text) {
         if (text == null) {
@@ -130,8 +130,8 @@
      * Constructs an AttributedString instance with the given text and attributes.
      * @param text The text for this attributed string.
      * @param attributes The attributes that apply to the entire string.
-     * @throws    NullPointerException if <code>text</code> or
-     *            <code>attributes</code> is null.
+     * @throws    NullPointerException if {@code text} or
+     *            {@code attributes} is null.
      * @throws    IllegalArgumentException if the text has length 0
      * and the attributes parameter is not an empty Map (attributes
      * cannot be applied to a 0-length range).
@@ -171,7 +171,7 @@
      * Constructs an AttributedString instance with the given attributed
      * text represented by AttributedCharacterIterator.
      * @param text The text for this attributed string.
-     * @throws    NullPointerException if <code>text</code> is null.
+     * @throws    NullPointerException if {@code text} is null.
      */
     public AttributedString(AttributedCharacterIterator text) {
         // If performance is critical, this constructor should be
@@ -192,7 +192,7 @@
      * @param beginIndex Index of the first character of the range.
      * @param endIndex Index of the character following the last character
      * of the range.
-     * @throws    NullPointerException if <code>text</code> is null.
+     * @throws    NullPointerException if {@code text} is null.
      * @throws    IllegalArgumentException if the subrange given by
      * beginIndex and endIndex is out of the text range.
      * @see java.text.Annotation
@@ -220,7 +220,7 @@
      * @param attributes Specifies attributes to be extracted
      * from the text. If null is specified, all available attributes will
      * be used.
-     * @throws    NullPointerException if <code>text</code> is null.
+     * @throws    NullPointerException if {@code text} is null.
      * @throws    IllegalArgumentException if the subrange given by
      * beginIndex and endIndex is out of the text range.
      * @see java.text.Annotation
@@ -307,7 +307,7 @@
      * Adds an attribute to the entire string.
      * @param attribute the attribute key
      * @param value the value of the attribute; may be null
-     * @throws    NullPointerException if <code>attribute</code> is null.
+     * @throws    NullPointerException if {@code attribute} is null.
      * @throws    IllegalArgumentException if the AttributedString has length 0
      * (attributes cannot be applied to a 0-length range).
      */
@@ -331,7 +331,7 @@
      * @param value The value of the attribute. May be null.
      * @param beginIndex Index of the first character of the range.
      * @param endIndex Index of the character following the last character of the range.
-     * @throws    NullPointerException if <code>attribute</code> is null.
+     * @throws    NullPointerException if {@code attribute} is null.
      * @throws    IllegalArgumentException if beginIndex is less than 0, endIndex is
      * greater than the length of the string, or beginIndex and endIndex together don't
      * define a non-empty subrange of the string.
@@ -356,7 +356,7 @@
      * @param beginIndex Index of the first character of the range.
      * @param endIndex Index of the character following the last
      * character of the range.
-     * @throws    NullPointerException if <code>attributes</code> is null.
+     * @throws    NullPointerException if {@code attributes} is null.
      * @throws    IllegalArgumentException if beginIndex is less than
      * 0, endIndex is greater than the length of the string, or
      * beginIndex and endIndex together don't define a non-empty
--- a/src/java.base/share/classes/java/text/Bidi.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/Bidi.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -261,7 +261,7 @@
 
     /**
      * Return the level of the nth logical run in this line.
-     * @param run the index of the run, between 0 and <code>getRunCount()</code>
+     * @param run the index of the run, between 0 and {@code getRunCount()}
      * @return the level of the run
      */
     public int getRunLevel(int run) {
@@ -271,7 +271,7 @@
     /**
      * Return the index of the character at the start of the nth logical run in this line, as
      * an offset from the start of the line.
-     * @param run the index of the run, between 0 and <code>getRunCount()</code>
+     * @param run the index of the run, between 0 and {@code getRunCount()}
      * @return the start of the run
      */
     public int getRunStart(int run) {
@@ -282,7 +282,7 @@
      * Return the index of the character past the end of the nth logical run in this line, as
      * an offset from the start of the line.  For example, this will return the length
      * of the line for the last run on the line.
-     * @param run the index of the run, between 0 and <code>getRunCount()</code>
+     * @param run the index of the run, between 0 and {@code getRunCount()}
      * @return limit the limit of the run
      */
     public int getRunLimit(int run) {
@@ -308,11 +308,11 @@
      * Reorder the objects in the array into visual order based on their levels.
      * This is a utility function to use when you have a collection of objects
      * representing runs of text in logical order, each run containing text
-     * at a single level.  The elements at <code>index</code> from
-     * <code>objectStart</code> up to <code>objectStart + count</code>
+     * at a single level.  The elements at {@code index} from
+     * {@code objectStart} up to {@code objectStart + count}
      * in the objects array will be reordered into visual order assuming
      * each run of text has the level indicated by the corresponding element
-     * in the levels array (at <code>index - objectStart + levelStart</code>).
+     * in the levels array (at {@code index - objectStart + levelStart}).
      *
      * @param levels an array representing the bidi level of each object
      * @param levelStart the start position in the levels array
--- a/src/java.base/share/classes/java/text/BreakIterator.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/BreakIterator.java	Tue Sep 24 09:43:43 2019 +0100
@@ -48,23 +48,23 @@
 
 
 /**
- * The <code>BreakIterator</code> class implements methods for finding
- * the location of boundaries in text. Instances of <code>BreakIterator</code>
+ * The {@code BreakIterator} class implements methods for finding
+ * the location of boundaries in text. Instances of {@code BreakIterator}
  * maintain a current position and scan over text
  * returning the index of characters where boundaries occur.
- * Internally, <code>BreakIterator</code> scans text using a
- * <code>CharacterIterator</code>, and is thus able to scan text held
- * by any object implementing that protocol. A <code>StringCharacterIterator</code>
- * is used to scan <code>String</code> objects passed to <code>setText</code>.
+ * Internally, {@code BreakIterator} scans text using a
+ * {@code CharacterIterator}, and is thus able to scan text held
+ * by any object implementing that protocol. A {@code StringCharacterIterator}
+ * is used to scan {@code String} objects passed to {@code setText}.
  *
  * <p>
  * You use the factory methods provided by this class to create
  * instances of various types of break iterators. In particular,
- * use <code>getWordInstance</code>, <code>getLineInstance</code>,
- * <code>getSentenceInstance</code>, and <code>getCharacterInstance</code>
- * to create <code>BreakIterator</code>s that perform
+ * use {@code getWordInstance}, {@code getLineInstance},
+ * {@code getSentenceInstance}, and {@code getCharacterInstance}
+ * to create {@code BreakIterator}s that perform
  * word, line, sentence, and character boundary analysis respectively.
- * A single <code>BreakIterator</code> can work only on one unit
+ * A single {@code BreakIterator} can work only on one unit
  * (word, line, sentence, and so on). You must use a different iterator
  * for each unit boundary analysis you wish to perform.
  *
@@ -100,7 +100,7 @@
  * differ between languages.
  *
  * <p>
- * The <code>BreakIterator</code> instances returned by the factory methods
+ * The {@code BreakIterator} instances returned by the factory methods
  * of this class are intended for use with natural languages only, not for
  * programming language text. It is however possible to define subclasses
  * that tokenize a programming language.
@@ -274,31 +274,31 @@
     /**
      * Returns the nth boundary from the current boundary. If either
      * the first or last text boundary has been reached, it returns
-     * <code>BreakIterator.DONE</code> and the current position is set to either
+     * {@code BreakIterator.DONE} and the current position is set to either
      * the first or last text boundary depending on which one is reached. Otherwise,
      * the iterator's current position is set to the new boundary.
      * For example, if the iterator's current position is the mth text boundary
      * and three more boundaries exist from the current boundary to the last text
      * boundary, the next(2) call will return m + 2. The new text position is set
      * to the (m + 2)th text boundary. A next(4) call would return
-     * <code>BreakIterator.DONE</code> and the last text boundary would become the
+     * {@code BreakIterator.DONE} and the last text boundary would become the
      * new text position.
      * @param n which boundary to return.  A value of 0
      * does nothing.  Negative values move to previous boundaries
      * and positive values move to later boundaries.
      * @return The character index of the nth boundary from the current position
-     * or <code>BreakIterator.DONE</code> if either first or last text boundary
+     * or {@code BreakIterator.DONE} if either first or last text boundary
      * has been reached.
      */
     public abstract int next(int n);
 
     /**
      * Returns the boundary following the current boundary. If the current boundary
-     * is the last text boundary, it returns <code>BreakIterator.DONE</code> and
+     * is the last text boundary, it returns {@code BreakIterator.DONE} and
      * the iterator's current position is unchanged. Otherwise, the iterator's
      * current position is set to the boundary following the current boundary.
      * @return The character index of the next text boundary or
-     * <code>BreakIterator.DONE</code> if the current boundary is the last text
+     * {@code BreakIterator.DONE} if the current boundary is the last text
      * boundary.
      * Equivalent to next(1).
      * @see #next(int)
@@ -307,11 +307,11 @@
 
     /**
      * Returns the boundary preceding the current boundary. If the current boundary
-     * is the first text boundary, it returns <code>BreakIterator.DONE</code> and
+     * is the first text boundary, it returns {@code BreakIterator.DONE} and
      * the iterator's current position is unchanged. Otherwise, the iterator's
      * current position is set to the boundary preceding the current boundary.
      * @return The character index of the previous text boundary or
-     * <code>BreakIterator.DONE</code> if the current boundary is the first text
+     * {@code BreakIterator.DONE} if the current boundary is the first text
      * boundary.
      */
     public abstract int previous();
@@ -319,13 +319,13 @@
     /**
      * Returns the first boundary following the specified character offset. If the
      * specified offset equals to the last text boundary, it returns
-     * <code>BreakIterator.DONE</code> and the iterator's current position is unchanged.
+     * {@code BreakIterator.DONE} and the iterator's current position is unchanged.
      * Otherwise, the iterator's current position is set to the returned boundary.
      * The value returned is always greater than the offset or the value
-     * <code>BreakIterator.DONE</code>.
+     * {@code BreakIterator.DONE}.
      * @param offset the character offset to begin scanning.
      * @return The first boundary after the specified offset or
-     * <code>BreakIterator.DONE</code> if the last text boundary is passed in
+     * {@code BreakIterator.DONE} if the last text boundary is passed in
      * as the offset.
      * @throws     IllegalArgumentException if the specified offset is less than
      * the first text boundary or greater than the last text boundary.
@@ -335,13 +335,13 @@
     /**
      * Returns the last boundary preceding the specified character offset. If the
      * specified offset equals to the first text boundary, it returns
-     * <code>BreakIterator.DONE</code> and the iterator's current position is unchanged.
+     * {@code BreakIterator.DONE} and the iterator's current position is unchanged.
      * Otherwise, the iterator's current position is set to the returned boundary.
      * The value returned is always less than the offset or the value
-     * <code>BreakIterator.DONE</code>.
+     * {@code BreakIterator.DONE}.
      * @param offset the character offset to begin scanning.
      * @return The last boundary before the specified offset or
-     * <code>BreakIterator.DONE</code> if the first text boundary is passed in
+     * {@code BreakIterator.DONE} if the first text boundary is passed in
      * as the offset.
      * @throws      IllegalArgumentException if the specified offset is less than
      * the first text boundary or greater than the last text boundary.
@@ -361,8 +361,8 @@
     /**
      * Returns true if the specified character offset is a text boundary.
      * @param offset the character offset to check.
-     * @return <code>true</code> if "offset" is a boundary position,
-     * <code>false</code> otherwise.
+     * @return {@code true} if "offset" is a boundary position,
+     * {@code false} otherwise.
      * @throws      IllegalArgumentException if the specified offset is less than
      * the first text boundary or greater than the last text boundary.
      * @since 1.2
@@ -390,7 +390,7 @@
      * Returns character index of the text boundary that was most
      * recently returned by next(), next(int), previous(), first(), last(),
      * following(int) or preceding(int). If any of these methods returns
-     * <code>BreakIterator.DONE</code> because either first or last text boundary
+     * {@code BreakIterator.DONE} because either first or last text boundary
      * has been reached, it returns the first or last text boundary depending on
      * which one is reached.
      * @return The text boundary returned from the above methods, first or last
@@ -437,7 +437,7 @@
     private static final SoftReference<BreakIteratorCache>[] iterCache = (SoftReference<BreakIteratorCache>[]) new SoftReference<?>[4];
 
     /**
-     * Returns a new <code>BreakIterator</code> instance
+     * Returns a new {@code BreakIterator} instance
      * for <a href="BreakIterator.html#word">word breaks</a>
      * for the {@linkplain Locale#getDefault() default locale}.
      * @return A break iterator for word breaks
@@ -448,12 +448,12 @@
     }
 
     /**
-     * Returns a new <code>BreakIterator</code> instance
+     * Returns a new {@code BreakIterator} instance
      * for <a href="BreakIterator.html#word">word breaks</a>
      * for the given locale.
      * @param locale the desired locale
      * @return A break iterator for word breaks
-     * @throws    NullPointerException if <code>locale</code> is null
+     * @throws    NullPointerException if {@code locale} is null
      */
     public static BreakIterator getWordInstance(Locale locale)
     {
@@ -461,7 +461,7 @@
     }
 
     /**
-     * Returns a new <code>BreakIterator</code> instance
+     * Returns a new {@code BreakIterator} instance
      * for <a href="BreakIterator.html#line">line breaks</a>
      * for the {@linkplain Locale#getDefault() default locale}.
      * @return A break iterator for line breaks
@@ -472,12 +472,12 @@
     }
 
     /**
-     * Returns a new <code>BreakIterator</code> instance
+     * Returns a new {@code BreakIterator} instance
      * for <a href="BreakIterator.html#line">line breaks</a>
      * for the given locale.
      * @param locale the desired locale
      * @return A break iterator for line breaks
-     * @throws    NullPointerException if <code>locale</code> is null
+     * @throws    NullPointerException if {@code locale} is null
      */
     public static BreakIterator getLineInstance(Locale locale)
     {
@@ -485,7 +485,7 @@
     }
 
     /**
-     * Returns a new <code>BreakIterator</code> instance
+     * Returns a new {@code BreakIterator} instance
      * for <a href="BreakIterator.html#character">character breaks</a>
      * for the {@linkplain Locale#getDefault() default locale}.
      * @return A break iterator for character breaks
@@ -496,12 +496,12 @@
     }
 
     /**
-     * Returns a new <code>BreakIterator</code> instance
+     * Returns a new {@code BreakIterator} instance
      * for <a href="BreakIterator.html#character">character breaks</a>
      * for the given locale.
      * @param locale the desired locale
      * @return A break iterator for character breaks
-     * @throws    NullPointerException if <code>locale</code> is null
+     * @throws    NullPointerException if {@code locale} is null
      */
     public static BreakIterator getCharacterInstance(Locale locale)
     {
@@ -509,7 +509,7 @@
     }
 
     /**
-     * Returns a new <code>BreakIterator</code> instance
+     * Returns a new {@code BreakIterator} instance
      * for <a href="BreakIterator.html#sentence">sentence breaks</a>
      * for the {@linkplain Locale#getDefault() default locale}.
      * @return A break iterator for sentence breaks
@@ -520,12 +520,12 @@
     }
 
     /**
-     * Returns a new <code>BreakIterator</code> instance
+     * Returns a new {@code BreakIterator} instance
      * for <a href="BreakIterator.html#sentence">sentence breaks</a>
      * for the given locale.
      * @param locale the desired locale
      * @return A break iterator for sentence breaks
-     * @throws    NullPointerException if <code>locale</code> is null
+     * @throws    NullPointerException if {@code locale} is null
      */
     public static BreakIterator getSentenceInstance(Locale locale)
     {
@@ -580,16 +580,16 @@
 
     /**
      * Returns an array of all locales for which the
-     * <code>get*Instance</code> methods of this class can return
+     * {@code get*Instance} methods of this class can return
      * localized instances.
      * The returned array represents the union of locales supported by the Java
      * runtime and by installed
      * {@link java.text.spi.BreakIteratorProvider BreakIteratorProvider} implementations.
-     * It must contain at least a <code>Locale</code>
+     * It must contain at least a {@code Locale}
      * instance equal to {@link java.util.Locale#US Locale.US}.
      *
      * @return An array of locales for which localized
-     *         <code>BreakIterator</code> instances are available.
+     *         {@code BreakIterator} instances are available.
      */
     public static synchronized Locale[] getAvailableLocales()
     {
--- a/src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/CharacterIteratorFieldDelegate.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,16 +28,16 @@
 
 /**
  * CharacterIteratorFieldDelegate combines the notifications from a Format
- * into a resulting <code>AttributedCharacterIterator</code>. The resulting
- * <code>AttributedCharacterIterator</code> can be retrieved by way of
- * the <code>getIterator</code> method.
+ * into a resulting {@code AttributedCharacterIterator}. The resulting
+ * {@code AttributedCharacterIterator} can be retrieved by way of
+ * the {@code getIterator} method.
  *
  */
 class CharacterIteratorFieldDelegate implements Format.FieldDelegate {
     /**
-     * Array of AttributeStrings. Whenever <code>formatted</code> is invoked
+     * Array of AttributeStrings. Whenever {@code formatted} is invoked
      * for a region > size, a new instance of AttributedString is added to
-     * attributedStrings. Subsequent invocations of <code>formatted</code>
+     * attributedStrings. Subsequent invocations of {@code formatted}
      * for existing regions result in invoking addAttribute on the existing
      * AttributedStrings.
      */
@@ -98,7 +98,7 @@
     }
 
     /**
-     * Returns an <code>AttributedCharacterIterator</code> that can be used
+     * Returns an {@code AttributedCharacterIterator} that can be used
      * to iterate over the resulting formatted String.
      *
      * @pararm string Result of formatting.
--- a/src/java.base/share/classes/java/text/ChoiceFormat.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/ChoiceFormat.java	Tue Sep 24 09:43:43 2019 +0100
@@ -44,8 +44,8 @@
 import java.util.Arrays;
 
 /**
- * A <code>ChoiceFormat</code> allows you to attach a format to a range of numbers.
- * It is generally used in a <code>MessageFormat</code> for handling plurals.
+ * A {@code ChoiceFormat} allows you to attach a format to a range of numbers.
+ * It is generally used in a {@code MessageFormat} for handling plurals.
  * The choice is specified with an ascending list of doubles, where each item
  * specifies a half-open interval up to the next item:
  * <blockquote>
@@ -60,15 +60,15 @@
  *
  * <p>
  * <strong>Note:</strong>
- * <code>ChoiceFormat</code> differs from the other <code>Format</code>
- * classes in that you create a <code>ChoiceFormat</code> object with a
- * constructor (not with a <code>getInstance</code> style factory
- * method). The factory methods aren't necessary because <code>ChoiceFormat</code>
+ * {@code ChoiceFormat} differs from the other {@code Format}
+ * classes in that you create a {@code ChoiceFormat} object with a
+ * constructor (not with a {@code getInstance} style factory
+ * method). The factory methods aren't necessary because {@code ChoiceFormat}
  * doesn't require any complex setup for a given locale. In fact,
- * <code>ChoiceFormat</code> doesn't implement any locale specific behavior.
+ * {@code ChoiceFormat} doesn't implement any locale specific behavior.
  *
  * <p>
- * When creating a <code>ChoiceFormat</code>, you must specify an array of formats
+ * When creating a {@code ChoiceFormat}, you must specify an array of formats
  * and an array of limits. The length of these arrays must be the same.
  * For example,
  * <ul>
@@ -78,7 +78,7 @@
  * <li>
  *     <em>limits</em> = {0, 1, ChoiceFormat.nextDouble(1)}<br>
  *     <em>formats</em> = {"no files", "one file", "many files"}<br>
- *     (<code>nextDouble</code> can be used to get the next higher double, to
+ *     ({@code nextDouble} can be used to get the next higher double, to
  *     make the half-open interval.)
  * </ul>
  *
@@ -381,7 +381,7 @@
 
     /**
      * Specialization of format. This method really calls
-     * <code>format(double, StringBuffer, FieldPosition)</code>
+     * {@code format(double, StringBuffer, FieldPosition)}
      * thus the range of longs that are supported is only equal to
      * the range that can be stored by double. This will never be
      * a practical limitation.
@@ -542,16 +542,16 @@
 
     /**
      * A list of lower bounds for the choices.  The formatter will return
-     * <code>choiceFormats[i]</code> if the number being formatted is greater than or equal to
-     * <code>choiceLimits[i]</code> and less than <code>choiceLimits[i+1]</code>.
+     * {@code choiceFormats[i]} if the number being formatted is greater than or equal to
+     * {@code choiceLimits[i]} and less than {@code choiceLimits[i+1]}.
      * @serial
      */
     private double[] choiceLimits;
 
     /**
      * A list of choice strings.  The formatter will return
-     * <code>choiceFormats[i]</code> if the number being formatted is greater than or equal to
-     * <code>choiceLimits[i]</code> and less than <code>choiceLimits[i+1]</code>.
+     * {@code choiceFormats[i]} if the number being formatted is greater than or equal to
+     * {@code choiceLimits[i]} and less than {@code choiceLimits[i+1]}.
      * @serial
      */
     private String[] choiceFormats;
--- a/src/java.base/share/classes/java/text/CollationElementIterator.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/CollationElementIterator.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
 import sun.text.normalizer.NormalizerBase;
 
 /**
- * The <code>CollationElementIterator</code> class is used as an iterator
+ * The {@code CollationElementIterator} class is used as an iterator
  * to walk through each character of an international string. Use the iterator
  * to return the ordering priority of the positioned character. The ordering
  * priority of a character, which we refer to as a key, defines how a character
@@ -68,9 +68,9 @@
  * The key of a character is an integer composed of primary order(short),
  * secondary order(byte), and tertiary order(byte). Java strictly defines
  * the size and signedness of its primitive data types. Therefore, the static
- * functions <code>primaryOrder</code>, <code>secondaryOrder</code>, and
- * <code>tertiaryOrder</code> return <code>int</code>, <code>short</code>,
- * and <code>short</code> respectively to ensure the correctness of the key
+ * functions {@code primaryOrder}, {@code secondaryOrder}, and
+ * {@code tertiaryOrder} return {@code int}, {@code short},
+ * and {@code short} respectively to ensure the correctness of the key
  * value.
  *
  * <p>
@@ -90,16 +90,16 @@
  * </blockquote>
  *
  * <p>
- * <code>CollationElementIterator.next</code> returns the collation order
+ * {@code CollationElementIterator.next} returns the collation order
  * of the next character. A collation order consists of primary order,
  * secondary order and tertiary order. The data type of the collation
  * order is <strong>int</strong>. The first 16 bits of a collation order
  * is its primary order; the next 8 bits is the secondary order and the
  * last 8 bits is the tertiary order.
  *
- * <p><b>Note:</b> <code>CollationElementIterator</code> is a part of
- * <code>RuleBasedCollator</code> implementation. It is only usable
- * with <code>RuleBasedCollator</code> instances.
+ * <p><b>Note:</b> {@code CollationElementIterator} is a part of
+ * {@code RuleBasedCollator} implementation. It is only usable
+ * with {@code RuleBasedCollator} instances.
  *
  * @see                Collator
  * @see                RuleBasedCollator
--- a/src/java.base/share/classes/java/text/CollationKey.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/CollationKey.java	Tue Sep 24 09:43:43 2019 +0100
@@ -39,34 +39,34 @@
 package java.text;
 
 /**
- * A <code>CollationKey</code> represents a <code>String</code> under the
- * rules of a specific <code>Collator</code> object. Comparing two
- * <code>CollationKey</code>s returns the relative order of the
- * <code>String</code>s they represent. Using <code>CollationKey</code>s
- * to compare <code>String</code>s is generally faster than using
- * <code>Collator.compare</code>. Thus, when the <code>String</code>s
+ * A {@code CollationKey} represents a {@code String} under the
+ * rules of a specific {@code Collator} object. Comparing two
+ * {@code CollationKey}s returns the relative order of the
+ * {@code String}s they represent. Using {@code CollationKey}s
+ * to compare {@code String}s is generally faster than using
+ * {@code Collator.compare}. Thus, when the {@code String}s
  * must be compared multiple times, for example when sorting a list
- * of <code>String</code>s. It's more efficient to use <code>CollationKey</code>s.
+ * of {@code String}s. It's more efficient to use {@code CollationKey}s.
  *
  * <p>
- * You can not create <code>CollationKey</code>s directly. Rather,
- * generate them by calling <code>Collator.getCollationKey</code>.
- * You can only compare <code>CollationKey</code>s generated from
- * the same <code>Collator</code> object.
+ * You can not create {@code CollationKey}s directly. Rather,
+ * generate them by calling {@code Collator.getCollationKey}.
+ * You can only compare {@code CollationKey}s generated from
+ * the same {@code Collator} object.
  *
  * <p>
- * Generating a <code>CollationKey</code> for a <code>String</code>
- * involves examining the entire <code>String</code>
+ * Generating a {@code CollationKey} for a {@code String}
+ * involves examining the entire {@code String}
  * and converting it to series of bits that can be compared bitwise. This
  * allows fast comparisons once the keys are generated. The cost of generating
- * keys is recouped in faster comparisons when <code>String</code>s need
+ * keys is recouped in faster comparisons when {@code String}s need
  * to be compared many times. On the other hand, the result of a comparison
- * is often determined by the first couple of characters of each <code>String</code>.
- * <code>Collator.compare</code> examines only as many characters as it needs which
+ * is often determined by the first couple of characters of each {@code String}.
+ * {@code Collator.compare} examines only as many characters as it needs which
  * allows it to be faster when doing single comparisons.
  * <p>
- * The following example shows how <code>CollationKey</code>s might be used
- * to sort a list of <code>String</code>s.
+ * The following example shows how {@code CollationKey}s might be used
+ * to sort a list of {@code String}s.
  * <blockquote>
  * <pre>{@code
  * // Create an array of CollationKeys for the Strings to be sorted.
--- a/src/java.base/share/classes/java/text/Collator.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/Collator.java	Tue Sep 24 09:43:43 2019 +0100
@@ -49,28 +49,28 @@
 
 
 /**
- * The <code>Collator</code> class performs locale-sensitive
- * <code>String</code> comparison. You use this class to build
+ * The {@code Collator} class performs locale-sensitive
+ * {@code String} comparison. You use this class to build
  * searching and sorting routines for natural language text.
  *
  * <p>
- * <code>Collator</code> is an abstract base class. Subclasses
+ * {@code Collator} is an abstract base class. Subclasses
  * implement specific collation strategies. One subclass,
- * <code>RuleBasedCollator</code>, is currently provided with
+ * {@code RuleBasedCollator}, is currently provided with
  * the Java Platform and is applicable to a wide set of languages. Other
  * subclasses may be created to handle more specialized needs.
  *
  * <p>
  * Like other locale-sensitive classes, you can use the static
- * factory method, <code>getInstance</code>, to obtain the appropriate
- * <code>Collator</code> object for a given locale. You will only need
- * to look at the subclasses of <code>Collator</code> if you need
+ * factory method, {@code getInstance}, to obtain the appropriate
+ * {@code Collator} object for a given locale. You will only need
+ * to look at the subclasses of {@code Collator} if you need
  * to understand the details of a particular collation strategy or
  * if you need to modify that strategy.
  *
  * <p>
  * The following example shows how to compare two strings using
- * the <code>Collator</code> for the default locale.
+ * the {@code Collator} for the default locale.
  * <blockquote>
  * <pre>{@code
  * // Compare two strings in the default locale
@@ -83,10 +83,10 @@
  * </blockquote>
  *
  * <p>
- * You can set a <code>Collator</code>'s <em>strength</em> property
+ * You can set a {@code Collator}'s <em>strength</em> property
  * to determine the level of difference considered significant in
- * comparisons. Four strengths are provided: <code>PRIMARY</code>,
- * <code>SECONDARY</code>, <code>TERTIARY</code>, and <code>IDENTICAL</code>.
+ * comparisons. Four strengths are provided: {@code PRIMARY},
+ * {@code SECONDARY}, {@code TERTIARY}, and {@code IDENTICAL}.
  * The exact assignment of strengths to language features is
  * locale dependent.  For example, in Czech, "e" and "f" are considered
  * primary differences, while "e" and "&#283;" are secondary differences,
@@ -104,19 +104,19 @@
  * </pre>
  * </blockquote>
  * <p>
- * For comparing <code>String</code>s exactly once, the <code>compare</code>
+ * For comparing {@code String}s exactly once, the {@code compare}
  * method provides the best performance. When sorting a list of
- * <code>String</code>s however, it is generally necessary to compare each
- * <code>String</code> multiple times. In this case, <code>CollationKey</code>s
- * provide better performance. The <code>CollationKey</code> class converts
- * a <code>String</code> to a series of bits that can be compared bitwise
- * against other <code>CollationKey</code>s. A <code>CollationKey</code> is
- * created by a <code>Collator</code> object for a given <code>String</code>.
+ * {@code String}s however, it is generally necessary to compare each
+ * {@code String} multiple times. In this case, {@code CollationKey}s
+ * provide better performance. The {@code CollationKey} class converts
+ * a {@code String} to a series of bits that can be compared bitwise
+ * against other {@code CollationKey}s. A {@code CollationKey} is
+ * created by a {@code Collator} object for a given {@code String}.
  * <br>
- * <strong>Note:</strong> <code>CollationKey</code>s from different
- * <code>Collator</code>s can not be compared. See the class description
+ * <strong>Note:</strong> {@code CollationKey}s from different
+ * {@code Collator}s can not be compared. See the class description
  * for {@link CollationKey}
- * for an example using <code>CollationKey</code>s.
+ * for an example using {@code CollationKey}s.
  *
  * @see         RuleBasedCollator
  * @see         CollationKey
@@ -291,7 +291,7 @@
      * to, or greater than the second.
      * <p>
      * This implementation merely returns
-     *  <code> compare((String)o1, (String)o2) </code>.
+     *  {@code  compare((String)o1, (String)o2) }.
      *
      * @return a negative integer, zero, or a positive integer as the
      *         first argument is less than, equal to, or greater than the
@@ -416,7 +416,7 @@
 
     /**
      * Returns an array of all locales for which the
-     * <code>getInstance</code> methods of this class can return
+     * {@code getInstance} methods of this class can return
      * localized instances.
      * The returned array represents the union of locales supported
      * by the Java runtime and by installed
@@ -425,7 +425,7 @@
      * {@link java.util.Locale#US Locale.US}.
      *
      * @return An array of locales for which localized
-     *         <code>Collator</code> instances are available.
+     *         {@code Collator} instances are available.
      */
     public static synchronized Locale[] getAvailableLocales() {
         LocaleServiceProviderPool pool =
--- a/src/java.base/share/classes/java/text/DateFormat.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/DateFormat.java	Tue Sep 24 09:43:43 2019 +0100
@@ -58,7 +58,7 @@
  * formats and parses dates or time in a language-independent manner.
  * The date/time formatting subclass, such as {@link SimpleDateFormat}, allows for
  * formatting (i.e., date &rarr; text), parsing (text &rarr; date), and
- * normalization.  The date is represented as a <code>Date</code> object or
+ * normalization.  The date is represented as a {@code Date} object or
  * as the milliseconds since January 1, 1970, 00:00:00 GMT.
  *
  * <p>{@code DateFormat} provides many class methods for obtaining default date/time
@@ -185,15 +185,15 @@
      *
      * <p>Subclasses should initialize this field to a {@link Calendar}
      * appropriate for the {@link Locale} associated with this
-     * <code>DateFormat</code>.
+     * {@code DateFormat}.
      * @serial
      */
     protected Calendar calendar;
 
     /**
-     * The number formatter that <code>DateFormat</code> uses to format numbers
+     * The number formatter that {@code DateFormat} uses to format numbers
      * in dates and times.  Subclasses should initialize this to a number format
-     * appropriate for the locale associated with this <code>DateFormat</code>.
+     * appropriate for the locale associated with this {@code DateFormat}.
      * @serial
      */
     protected NumberFormat numberFormat;
@@ -383,8 +383,8 @@
      * See the {@link #parse(String, ParsePosition)} method for more information
      * on date parsing.
      *
-     * @param source A <code>String</code> whose beginning should be parsed.
-     * @return A <code>Date</code> parsed from the string.
+     * @param source A {@code String} whose beginning should be parsed.
+     * @return A {@code Date} parsed from the string.
      * @throws    ParseException if the beginning of the specified string
      *            cannot be parsed.
      */
@@ -427,26 +427,26 @@
     public abstract Date parse(String source, ParsePosition pos);
 
     /**
-     * Parses text from a string to produce a <code>Date</code>.
+     * Parses text from a string to produce a {@code Date}.
      * <p>
      * The method attempts to parse text starting at the index given by
-     * <code>pos</code>.
-     * If parsing succeeds, then the index of <code>pos</code> is updated
+     * {@code pos}.
+     * If parsing succeeds, then the index of {@code pos} is updated
      * to the index after the last character used (parsing does not necessarily
      * use all characters up to the end of the string), and the parsed
-     * date is returned. The updated <code>pos</code> can be used to
+     * date is returned. The updated {@code pos} can be used to
      * indicate the starting point for the next call to this method.
-     * If an error occurs, then the index of <code>pos</code> is not
-     * changed, the error index of <code>pos</code> is set to the index of
+     * If an error occurs, then the index of {@code pos} is not
+     * changed, the error index of {@code pos} is set to the index of
      * the character where the error occurred, and null is returned.
      * <p>
      * See the {@link #parse(String, ParsePosition)} method for more information
      * on date parsing.
      *
-     * @param source A <code>String</code>, part of which should be parsed.
-     * @param pos A <code>ParsePosition</code> object with index and error
+     * @param source A {@code String}, part of which should be parsed.
+     * @param pos A {@code ParsePosition} object with index and error
      *            index information as described above.
-     * @return A <code>Date</code> parsed from the string. In case of
+     * @return A {@code Date} parsed from the string. In case of
      *         error, returns null.
      * @throws NullPointerException if {@code source} or {@code pos} is null.
      */
@@ -628,16 +628,16 @@
 
     /**
      * Returns an array of all locales for which the
-     * <code>get*Instance</code> methods of this class can return
+     * {@code get*Instance} methods of this class can return
      * localized instances.
      * The returned array represents the union of locales supported by the Java
      * runtime and by installed
      * {@link java.text.spi.DateFormatProvider DateFormatProvider} implementations.
-     * It must contain at least a <code>Locale</code> instance equal to
+     * It must contain at least a {@code Locale} instance equal to
      * {@link java.util.Locale#US Locale.US}.
      *
      * @return An array of locales for which localized
-     *         <code>DateFormat</code> instances are available.
+     *         {@code DateFormat} instances are available.
      */
     public static Locale[] getAvailableLocales()
     {
@@ -854,9 +854,9 @@
 
     /**
      * Defines constants that are used as attribute keys in the
-     * <code>AttributedCharacterIterator</code> returned
-     * from <code>DateFormat.formatToCharacterIterator</code> and as
-     * field identifiers in <code>FieldPosition</code>.
+     * {@code AttributedCharacterIterator} returned
+     * from {@code DateFormat.formatToCharacterIterator} and as
+     * field identifiers in {@code FieldPosition}.
      * <p>
      * The class also provides two methods to map
      * between its constants and the corresponding Calendar constants.
@@ -881,13 +881,13 @@
         private int calendarField;
 
         /**
-         * Returns the <code>Field</code> constant that corresponds to
-         * the <code>Calendar</code> constant <code>calendarField</code>.
-         * If there is no direct mapping between the <code>Calendar</code>
-         * constant and a <code>Field</code>, null is returned.
+         * Returns the {@code Field} constant that corresponds to
+         * the {@code Calendar} constant {@code calendarField}.
+         * If there is no direct mapping between the {@code Calendar}
+         * constant and a {@code Field}, null is returned.
          *
-         * @throws IllegalArgumentException if <code>calendarField</code> is
-         *         not the value of a <code>Calendar</code> field constant.
+         * @throws IllegalArgumentException if {@code calendarField} is
+         *         not the value of a {@code Calendar} field constant.
          * @param calendarField Calendar field constant
          * @return Field instance representing calendarField.
          * @see java.util.Calendar
@@ -902,14 +902,14 @@
         }
 
         /**
-         * Creates a <code>Field</code>.
+         * Creates a {@code Field}.
          *
-         * @param name the name of the <code>Field</code>
-         * @param calendarField the <code>Calendar</code> constant this
-         *        <code>Field</code> corresponds to; any value, even one
-         *        outside the range of legal <code>Calendar</code> values may
-         *        be used, but <code>-1</code> should be used for values
-         *        that don't correspond to legal <code>Calendar</code> values
+         * @param name the name of the {@code Field}
+         * @param calendarField the {@code Calendar} constant this
+         *        {@code Field} corresponds to; any value, even one
+         *        outside the range of legal {@code Calendar} values may
+         *        be used, but {@code -1} should be used for values
+         *        that don't correspond to legal {@code Calendar} values
          */
         protected Field(String name, int calendarField) {
             super(name);
@@ -924,11 +924,11 @@
         }
 
         /**
-         * Returns the <code>Calendar</code> field associated with this
+         * Returns the {@code Calendar} field associated with this
          * attribute. For example, if this represents the hours field of
-         * a <code>Calendar</code>, this would return
-         * <code>Calendar.HOUR</code>. If there is no corresponding
-         * <code>Calendar</code> constant, this will return -1.
+         * a {@code Calendar}, this would return
+         * {@code Calendar.HOUR}. If there is no corresponding
+         * {@code Calendar} constant, this will return -1.
          *
          * @return Calendar constant for this field
          * @see java.util.Calendar
--- a/src/java.base/share/classes/java/text/DateFormatSymbols.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/DateFormatSymbols.java	Tue Sep 24 09:43:43 2019 +0100
@@ -56,22 +56,22 @@
 import sun.util.locale.provider.TimeZoneNameUtility;
 
 /**
- * <code>DateFormatSymbols</code> is a public class for encapsulating
+ * {@code DateFormatSymbols} is a public class for encapsulating
  * localizable date-time formatting data, such as the names of the
  * months, the names of the days of the week, and the time zone data.
- * <code>SimpleDateFormat</code> uses
- * <code>DateFormatSymbols</code> to encapsulate this information.
+ * {@code SimpleDateFormat} uses
+ * {@code DateFormatSymbols} to encapsulate this information.
  *
  * <p>
- * Typically you shouldn't use <code>DateFormatSymbols</code> directly.
+ * Typically you shouldn't use {@code DateFormatSymbols} directly.
  * Rather, you are encouraged to create a date-time formatter with the
- * <code>DateFormat</code> class's factory methods: <code>getTimeInstance</code>,
- * <code>getDateInstance</code>, or <code>getDateTimeInstance</code>.
- * These methods automatically create a <code>DateFormatSymbols</code> for
+ * {@code DateFormat} class's factory methods: {@code getTimeInstance},
+ * {@code getDateInstance}, or {@code getDateTimeInstance}.
+ * These methods automatically create a {@code DateFormatSymbols} for
  * the formatter so that you don't have to. After the
  * formatter is created, you may modify its format pattern using the
- * <code>setPattern</code> method. For more information about
- * creating formatters using <code>DateFormat</code>'s factory methods,
+ * {@code setPattern} method. For more information about
+ * creating formatters using {@code DateFormat}'s factory methods,
  * see {@link DateFormat}.
  *
  * <p>
@@ -88,16 +88,16 @@
  * the symbols are overridden for the designated region.
  *
  * <p>
- * <code>DateFormatSymbols</code> objects are cloneable. When you obtain
- * a <code>DateFormatSymbols</code> object, feel free to modify the
+ * {@code DateFormatSymbols} objects are cloneable. When you obtain
+ * a {@code DateFormatSymbols} object, feel free to modify the
  * date-time formatting data. For instance, you can replace the localized
  * date-time format pattern characters with the ones that you feel easy
  * to remember. Or you can change the representative cities
  * to your favorite ones.
  *
  * <p>
- * New <code>DateFormatSymbols</code> subclasses may be added to support
- * <code>SimpleDateFormat</code> for date-time formatting for additional locales.
+ * New {@code DateFormatSymbols} subclasses may be added to support
+ * {@code SimpleDateFormat} for date-time formatting for additional locales.
 
  * @see          DateFormat
  * @see          SimpleDateFormat
@@ -159,7 +159,7 @@
 
     /**
      * Era strings. For example: "AD" and "BC".  An array of 2 strings,
-     * indexed by <code>Calendar.BC</code> and <code>Calendar.AD</code>.
+     * indexed by {@code Calendar.BC} and {@code Calendar.AD}.
      * @serial
      */
     String eras[] = null;
@@ -167,7 +167,7 @@
     /**
      * Month strings. For example: "January", "February", etc.  An array
      * of 13 strings (some calendars have 13 months), indexed by
-     * <code>Calendar.JANUARY</code>, <code>Calendar.FEBRUARY</code>, etc.
+     * {@code Calendar.JANUARY}, {@code Calendar.FEBRUARY}, etc.
      * @serial
      */
     String months[] = null;
@@ -175,7 +175,7 @@
     /**
      * Short month strings. For example: "Jan", "Feb", etc.  An array of
      * 13 strings (some calendars have 13 months), indexed by
-     * <code>Calendar.JANUARY</code>, <code>Calendar.FEBRUARY</code>, etc.
+     * {@code Calendar.JANUARY}, {@code Calendar.FEBRUARY}, etc.
 
      * @serial
      */
@@ -183,26 +183,26 @@
 
     /**
      * Weekday strings. For example: "Sunday", "Monday", etc.  An array
-     * of 8 strings, indexed by <code>Calendar.SUNDAY</code>,
-     * <code>Calendar.MONDAY</code>, etc.
-     * The element <code>weekdays[0]</code> is ignored.
+     * of 8 strings, indexed by {@code Calendar.SUNDAY},
+     * {@code Calendar.MONDAY}, etc.
+     * The element {@code weekdays[0]} is ignored.
      * @serial
      */
     String weekdays[] = null;
 
     /**
      * Short weekday strings. For example: "Sun", "Mon", etc.  An array
-     * of 8 strings, indexed by <code>Calendar.SUNDAY</code>,
-     * <code>Calendar.MONDAY</code>, etc.
-     * The element <code>shortWeekdays[0]</code> is ignored.
+     * of 8 strings, indexed by {@code Calendar.SUNDAY},
+     * {@code Calendar.MONDAY}, etc.
+     * The element {@code shortWeekdays[0]} is ignored.
      * @serial
      */
     String shortWeekdays[] = null;
 
     /**
      * AM and PM strings. For example: "AM" and "PM".  An array of
-     * 2 strings, indexed by <code>Calendar.AM</code> and
-     * <code>Calendar.PM</code>.
+     * 2 strings, indexed by {@code Calendar.AM} and
+     * {@code Calendar.PM}.
      * @serial
      */
     String ampms[] = null;
@@ -211,18 +211,18 @@
      * Localized names of time zones in this locale.  This is a
      * two-dimensional array of strings of size <em>n</em> by <em>m</em>,
      * where <em>m</em> is at least 5.  Each of the <em>n</em> rows is an
-     * entry containing the localized names for a single <code>TimeZone</code>.
-     * Each such row contains (with <code>i</code> ranging from
+     * entry containing the localized names for a single {@code TimeZone}.
+     * Each such row contains (with {@code i} ranging from
      * 0..<em>n</em>-1):
      * <ul>
-     * <li><code>zoneStrings[i][0]</code> - time zone ID</li>
-     * <li><code>zoneStrings[i][1]</code> - long name of zone in standard
+     * <li>{@code zoneStrings[i][0]} - time zone ID</li>
+     * <li>{@code zoneStrings[i][1]} - long name of zone in standard
      * time</li>
-     * <li><code>zoneStrings[i][2]</code> - short name of zone in
+     * <li>{@code zoneStrings[i][2]} - short name of zone in
      * standard time</li>
-     * <li><code>zoneStrings[i][3]</code> - long name of zone in daylight
+     * <li>{@code zoneStrings[i][3]} - long name of zone in daylight
      * saving time</li>
-     * <li><code>zoneStrings[i][4]</code> - short name of zone in daylight
+     * <li>{@code zoneStrings[i][4]} - short name of zone in daylight
      * saving time</li>
      * </ul>
      * The zone ID is <em>not</em> localized; it's one of the valid IDs of
@@ -274,8 +274,8 @@
      * wish to use 'u' rather than 'y' to represent years in its date format
      * pattern strings.
      * This string must be exactly 18 characters long, with the index of
-     * the characters described by <code>DateFormat.ERA_FIELD</code>,
-     * <code>DateFormat.YEAR_FIELD</code>, etc.  Thus, if the string were
+     * the characters described by {@code DateFormat.ERA_FIELD},
+     * {@code DateFormat.YEAR_FIELD}, etc.  Thus, if the string were
      * "Xz...", then localized patterns would use 'X' for era and 'z' for year.
      * @serial
      */
@@ -295,16 +295,16 @@
 
     /**
      * Returns an array of all locales for which the
-     * <code>getInstance</code> methods of this class can return
+     * {@code getInstance} methods of this class can return
      * localized instances.
      * The returned array represents the union of locales supported by the
      * Java runtime and by installed
      * {@link java.text.spi.DateFormatSymbolsProvider DateFormatSymbolsProvider}
-     * implementations.  It must contain at least a <code>Locale</code>
+     * implementations.  It must contain at least a {@code Locale}
      * instance equal to {@link java.util.Locale#US Locale.US}.
      *
      * @return An array of locales for which localized
-     *         <code>DateFormatSymbols</code> instances are available.
+     *         {@code DateFormatSymbols} instances are available.
      * @since 1.6
      */
     public static Locale[] getAvailableLocales() {
@@ -314,8 +314,8 @@
     }
 
     /**
-     * Gets the <code>DateFormatSymbols</code> instance for the default
-     * locale.  This method provides access to <code>DateFormatSymbols</code>
+     * Gets the {@code DateFormatSymbols} instance for the default
+     * locale.  This method provides access to {@code DateFormatSymbols}
      * instances for locales supported by the Java runtime itself as well
      * as for those supported by installed
      * {@link java.text.spi.DateFormatSymbolsProvider DateFormatSymbolsProvider}
@@ -324,7 +324,7 @@
      *     getInstance(Locale.getDefault(Locale.Category.FORMAT))}.
      * @see java.util.Locale#getDefault(java.util.Locale.Category)
      * @see java.util.Locale.Category#FORMAT
-     * @return a <code>DateFormatSymbols</code> instance.
+     * @return a {@code DateFormatSymbols} instance.
      * @since 1.6
      */
     public static final DateFormatSymbols getInstance() {
@@ -332,15 +332,15 @@
     }
 
     /**
-     * Gets the <code>DateFormatSymbols</code> instance for the specified
-     * locale.  This method provides access to <code>DateFormatSymbols</code>
+     * Gets the {@code DateFormatSymbols} instance for the specified
+     * locale.  This method provides access to {@code DateFormatSymbols}
      * instances for locales supported by the Java runtime itself as well
      * as for those supported by installed
      * {@link java.text.spi.DateFormatSymbolsProvider DateFormatSymbolsProvider}
      * implementations.
      * @param locale the given locale.
-     * @return a <code>DateFormatSymbols</code> instance.
-     * @throws    NullPointerException if <code>locale</code> is null
+     * @return a {@code DateFormatSymbols} instance.
+     * @throws    NullPointerException if {@code locale} is null
      * @since 1.6
      */
     public static final DateFormatSymbols getInstance(Locale locale) {
@@ -538,18 +538,18 @@
      * The value returned is a
      * two-dimensional array of strings of size <em>n</em> by <em>m</em>,
      * where <em>m</em> is at least 5.  Each of the <em>n</em> rows is an
-     * entry containing the localized names for a single <code>TimeZone</code>.
-     * Each such row contains (with <code>i</code> ranging from
+     * entry containing the localized names for a single {@code TimeZone}.
+     * Each such row contains (with {@code i} ranging from
      * 0..<em>n</em>-1):
      * <ul>
-     * <li><code>zoneStrings[i][0]</code> - time zone ID</li>
-     * <li><code>zoneStrings[i][1]</code> - long name of zone in standard
+     * <li>{@code zoneStrings[i][0]} - time zone ID</li>
+     * <li>{@code zoneStrings[i][1]} - long name of zone in standard
      * time</li>
-     * <li><code>zoneStrings[i][2]</code> - short name of zone in
+     * <li>{@code zoneStrings[i][2]} - short name of zone in
      * standard time</li>
-     * <li><code>zoneStrings[i][3]</code> - long name of zone in daylight
+     * <li>{@code zoneStrings[i][3]} - long name of zone in daylight
      * saving time</li>
-     * <li><code>zoneStrings[i][4]</code> - short name of zone in daylight
+     * <li>{@code zoneStrings[i][4]} - short name of zone in daylight
      * saving time</li>
      * </ul>
      * The zone ID is <em>not</em> localized; it's one of the valid IDs of
@@ -559,7 +559,7 @@
      * daylight saving time, the daylight saving time names should not be used.
      * <p>
      * If {@link #setZoneStrings(String[][]) setZoneStrings} has been called
-     * on this <code>DateFormatSymbols</code> instance, then the strings
+     * on this {@code DateFormatSymbols} instance, then the strings
      * provided by that call are returned. Otherwise, the returned array
      * contains names provided by the Java runtime and by installed
      * {@link java.util.spi.TimeZoneNameProvider TimeZoneNameProvider}
@@ -576,18 +576,18 @@
      * Sets time zone strings.  The argument must be a
      * two-dimensional array of strings of size <em>n</em> by <em>m</em>,
      * where <em>m</em> is at least 5.  Each of the <em>n</em> rows is an
-     * entry containing the localized names for a single <code>TimeZone</code>.
-     * Each such row contains (with <code>i</code> ranging from
+     * entry containing the localized names for a single {@code TimeZone}.
+     * Each such row contains (with {@code i} ranging from
      * 0..<em>n</em>-1):
      * <ul>
-     * <li><code>zoneStrings[i][0]</code> - time zone ID</li>
-     * <li><code>zoneStrings[i][1]</code> - long name of zone in standard
+     * <li>{@code zoneStrings[i][0]} - time zone ID</li>
+     * <li>{@code zoneStrings[i][1]} - long name of zone in standard
      * time</li>
-     * <li><code>zoneStrings[i][2]</code> - short name of zone in
+     * <li>{@code zoneStrings[i][2]} - short name of zone in
      * standard time</li>
-     * <li><code>zoneStrings[i][3]</code> - long name of zone in daylight
+     * <li>{@code zoneStrings[i][3]} - long name of zone in daylight
      * saving time</li>
-     * <li><code>zoneStrings[i][4]</code> - short name of zone in daylight
+     * <li>{@code zoneStrings[i][4]} - short name of zone in daylight
      * saving time</li>
      * </ul>
      * The zone ID is <em>not</em> localized; it's one of the valid IDs of
@@ -597,8 +597,8 @@
      *
      * @param newZoneStrings the new time zone strings.
      * @throws    IllegalArgumentException if the length of any row in
-     *    <code>newZoneStrings</code> is less than 5
-     * @throws    NullPointerException if <code>newZoneStrings</code> is null
+     *    {@code newZoneStrings} is less than 5
+     * @throws    NullPointerException if {@code newZoneStrings} is null
      * @see #getZoneStrings()
      */
     public void setZoneStrings(String[][] newZoneStrings) {
@@ -888,7 +888,7 @@
 
     /**
      * Write out the default serializable data, after ensuring the
-     * <code>zoneStrings</code> field is initialized in order to make
+     * {@code zoneStrings} field is initialized in order to make
      * sure the backward compatibility.
      *
      * @since 1.6
--- a/src/java.base/share/classes/java/text/DigitList.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/DigitList.java	Tue Sep 24 09:43:43 2019 +0100
@@ -439,7 +439,7 @@
      * java.math.RoundingMode class.
      * [bnf]
      * @param maximumDigits the number of digits to keep, from 0 to
-     * <code>count-1</code>.  If 0, then all digits are rounded away, and
+     * {@code count-1}.  If 0, then all digits are rounded away, and
      * this method returns true if a one should be generated (e.g., formatting
      * 0.09 with "#.#").
      * @param alreadyRounded whether or not rounding up has already happened.
@@ -447,7 +447,7 @@
      * an exact decimal representation of the value.
      * @throws    ArithmeticException if rounding is needed with rounding
      *            mode being set to RoundingMode.UNNECESSARY
-     * @return true if digit <code>maximumDigits-1</code> should be
+     * @return true if digit {@code maximumDigits-1} should be
      * incremented
      */
     private boolean shouldRoundUp(int maximumDigits,
--- a/src/java.base/share/classes/java/text/FieldPosition.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/FieldPosition.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,33 +39,33 @@
 package java.text;
 
 /**
- * <code>FieldPosition</code> is a simple class used by <code>Format</code>
+ * {@code FieldPosition} is a simple class used by {@code Format}
  * and its subclasses to identify fields in formatted output. Fields can
  * be identified in two ways:
  * <ul>
  *  <li>By an integer constant, whose names typically end with
- *      <code>_FIELD</code>. The constants are defined in the various
- *      subclasses of <code>Format</code>.
- *  <li>By a <code>Format.Field</code> constant, see <code>ERA_FIELD</code>
- *      and its friends in <code>DateFormat</code> for an example.
+ *      {@code _FIELD}. The constants are defined in the various
+ *      subclasses of {@code Format}.
+ *  <li>By a {@code Format.Field} constant, see {@code ERA_FIELD}
+ *      and its friends in {@code DateFormat} for an example.
  * </ul>
  * <p>
- * <code>FieldPosition</code> keeps track of the position of the
+ * {@code FieldPosition} keeps track of the position of the
  * field within the formatted output with two indices: the index
  * of the first character of the field and the index of the last
  * character of the field.
  *
  * <p>
- * One version of the <code>format</code> method in the various
- * <code>Format</code> classes requires a <code>FieldPosition</code>
- * object as an argument. You use this <code>format</code> method
+ * One version of the {@code format} method in the various
+ * {@code Format} classes requires a {@code FieldPosition}
+ * object as an argument. You use this {@code format} method
  * to perform partial formatting or to get information about the
  * formatted output (such as the position of a field).
  *
  * <p>
  * If you are interested in the positions of all attributes in the
- * formatted string use the <code>Format</code> method
- * <code>formatToCharacterIterator</code>.
+ * formatted string use the {@code Format} method
+ * {@code formatToCharacterIterator}.
  *
  * @author      Mark Davis
  * @since 1.1
@@ -113,9 +113,9 @@
 
     /**
      * Creates a FieldPosition object for the given field constant. Fields are
-     * identified by constants defined in the various <code>Format</code>
+     * identified by constants defined in the various {@code Format}
      * subclasses. This is equivalent to calling
-     * <code>new FieldPosition(attribute, -1)</code>.
+     * {@code new FieldPosition(attribute, -1)}.
      *
      * @param attribute Format.Field constant identifying a field
      * @since 1.4
@@ -125,16 +125,16 @@
     }
 
     /**
-     * Creates a <code>FieldPosition</code> object for the given field.
+     * Creates a {@code FieldPosition} object for the given field.
      * The field is identified by an attribute constant from one of the
-     * <code>Field</code> subclasses as well as an integer field ID
-     * defined by the <code>Format</code> subclasses. <code>Format</code>
-     * subclasses that are aware of <code>Field</code> should give precedence
-     * to <code>attribute</code> and ignore <code>fieldID</code> if
-     * <code>attribute</code> is not null. However, older <code>Format</code>
-     * subclasses may not be aware of <code>Field</code> and rely on
-     * <code>fieldID</code>. If the field has no corresponding integer
-     * constant, <code>fieldID</code> should be -1.
+     * {@code Field} subclasses as well as an integer field ID
+     * defined by the {@code Format} subclasses. {@code Format}
+     * subclasses that are aware of {@code Field} should give precedence
+     * to {@code attribute} and ignore {@code fieldID} if
+     * {@code attribute} is not null. However, older {@code Format}
+     * subclasses may not be aware of {@code Field} and rely on
+     * {@code fieldID}. If the field has no corresponding integer
+     * constant, {@code fieldID} should be -1.
      *
      * @param attribute Format.Field constant identifying a field
      * @param fieldID integer constant identifying a field
@@ -147,7 +147,7 @@
 
     /**
      * Returns the field identifier as an attribute constant
-     * from one of the <code>Field</code> subclasses. May return null if
+     * from one of the {@code Field} subclasses. May return null if
      * the field is specified only by an integer field ID.
      *
      * @return Identifier for the field
@@ -206,7 +206,7 @@
     }
 
     /**
-     * Returns a <code>Format.FieldDelegate</code> instance that is associated
+     * Returns a {@code Format.FieldDelegate} instance that is associated
      * with the FieldPosition. When the delegate is notified of the same
      * field the FieldPosition is associated with, the begin/end will be
      * adjusted.
@@ -258,8 +258,8 @@
 
 
     /**
-     * Return true if the receiver wants a <code>Format.Field</code> value and
-     * <code>attribute</code> is equal to it.
+     * Return true if the receiver wants a {@code Format.Field} value and
+     * {@code attribute} is equal to it.
      */
     private boolean matchesField(Format.Field attribute) {
         if (this.attribute != null) {
@@ -269,9 +269,9 @@
     }
 
     /**
-     * Return true if the receiver wants a <code>Format.Field</code> value and
-     * <code>attribute</code> is equal to it, or true if the receiver
-     * represents an inteter constant and <code>field</code> equals it.
+     * Return true if the receiver wants a {@code Format.Field} value and
+     * {@code attribute} is equal to it, or true if the receiver
+     * represents an inteter constant and {@code field} equals it.
      */
     private boolean matchesField(Format.Field attribute, int field) {
         if (this.attribute != null) {
@@ -289,7 +289,7 @@
     private class Delegate implements Format.FieldDelegate {
         /**
          * Indicates whether the field has been  encountered before. If this
-         * is true, and <code>formatted</code> is invoked, the begin/end
+         * is true, and {@code formatted} is invoked, the begin/end
          * are not updated.
          */
         private boolean encounteredField;
--- a/src/java.base/share/classes/java/text/Format.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/Format.java	Tue Sep 24 09:43:43 2019 +0100
@@ -41,64 +41,64 @@
 import java.io.Serializable;
 
 /**
- * <code>Format</code> is an abstract base class for formatting locale-sensitive
+ * {@code Format} is an abstract base class for formatting locale-sensitive
  * information such as dates, messages, and numbers.
  *
  * <p>
- * <code>Format</code> defines the programming interface for formatting
- * locale-sensitive objects into <code>String</code>s (the
- * <code>format</code> method) and for parsing <code>String</code>s back
- * into objects (the <code>parseObject</code> method).
+ * {@code Format} defines the programming interface for formatting
+ * locale-sensitive objects into {@code String}s (the
+ * {@code format} method) and for parsing {@code String}s back
+ * into objects (the {@code parseObject} method).
  *
  * <p>
- * Generally, a format's <code>parseObject</code> method must be able to parse
- * any string formatted by its <code>format</code> method. However, there may
+ * Generally, a format's {@code parseObject} method must be able to parse
+ * any string formatted by its {@code format} method. However, there may
  * be exceptional cases where this is not possible. For example, a
- * <code>format</code> method might create two adjacent integer numbers with
- * no separator in between, and in this case the <code>parseObject</code> could
+ * {@code format} method might create two adjacent integer numbers with
+ * no separator in between, and in this case the {@code parseObject} could
  * not tell which digits belong to which number.
  *
  * <h2>Subclassing</h2>
  *
  * <p>
- * The Java Platform provides three specialized subclasses of <code>Format</code>--
- * <code>DateFormat</code>, <code>MessageFormat</code>, and
- * <code>NumberFormat</code>--for formatting dates, messages, and numbers,
+ * The Java Platform provides three specialized subclasses of {@code Format}--
+ * {@code DateFormat}, {@code MessageFormat}, and
+ * {@code NumberFormat}--for formatting dates, messages, and numbers,
  * respectively.
  * <p>
  * Concrete subclasses must implement three methods:
  * <ol>
- * <li> <code>format(Object obj, StringBuffer toAppendTo, FieldPosition pos)</code>
- * <li> <code>formatToCharacterIterator(Object obj)</code>
- * <li> <code>parseObject(String source, ParsePosition pos)</code>
+ * <li> {@code format(Object obj, StringBuffer toAppendTo, FieldPosition pos)}
+ * <li> {@code formatToCharacterIterator(Object obj)}
+ * <li> {@code parseObject(String source, ParsePosition pos)}
  * </ol>
  * These general methods allow polymorphic parsing and formatting of objects
- * and are used, for example, by <code>MessageFormat</code>.
- * Subclasses often also provide additional <code>format</code> methods for
- * specific input types as well as <code>parse</code> methods for specific
- * result types. Any <code>parse</code> method that does not take a
- * <code>ParsePosition</code> argument should throw <code>ParseException</code>
+ * and are used, for example, by {@code MessageFormat}.
+ * Subclasses often also provide additional {@code format} methods for
+ * specific input types as well as {@code parse} methods for specific
+ * result types. Any {@code parse} method that does not take a
+ * {@code ParsePosition} argument should throw {@code ParseException}
  * when no text in the required format is at the beginning of the input text.
  *
  * <p>
  * Most subclasses will also implement the following factory methods:
  * <ol>
  * <li>
- * <code>getInstance</code> for getting a useful format object appropriate
+ * {@code getInstance} for getting a useful format object appropriate
  * for the current locale
  * <li>
- * <code>getInstance(Locale)</code> for getting a useful format
+ * {@code getInstance(Locale)} for getting a useful format
  * object appropriate for the specified locale
  * </ol>
  * In addition, some subclasses may also implement other
- * <code>getXxxxInstance</code> methods for more specialized control. For
- * example, the <code>NumberFormat</code> class provides
- * <code>getPercentInstance</code> and <code>getCurrencyInstance</code>
+ * {@code getXxxxInstance} methods for more specialized control. For
+ * example, the {@code NumberFormat} class provides
+ * {@code getPercentInstance} and {@code getCurrencyInstance}
  * methods for getting specialized number formatters.
  *
  * <p>
- * Subclasses of <code>Format</code> that allow programmers to create objects
- * for locales (with <code>getInstance(Locale)</code> for example)
+ * Subclasses of {@code Format} that allow programmers to create objects
+ * for locales (with {@code getInstance(Locale)} for example)
  * must also implement the following class method:
  * <blockquote>
  * <pre>
@@ -112,7 +112,7 @@
  * object which identifies what information is contained in the field and its
  * position in the formatted result. These constants should be named
  * <code><em>item</em>_FIELD</code> where <code><em>item</em></code> identifies
- * the field. For examples of these constants, see <code>ERA_FIELD</code> and its
+ * the field. For examples of these constants, see {@code ERA_FIELD} and its
  * friends in {@link DateFormat}.
  *
  * <h3><a id="synchronization">Synchronization</a></h3>
@@ -162,18 +162,18 @@
     /**
      * Formats an object and appends the resulting text to a given string
      * buffer.
-     * If the <code>pos</code> argument identifies a field used by the format,
+     * If the {@code pos} argument identifies a field used by the format,
      * then its indices are set to the beginning and end of the first such
      * field encountered.
      *
      * @param obj    The object to format
      * @param toAppendTo    where the text is to be appended
-     * @param pos    A <code>FieldPosition</code> identifying a field
+     * @param pos    A {@code FieldPosition} identifying a field
      *               in the formatted text
-     * @return       the string buffer passed in as <code>toAppendTo</code>,
+     * @return       the string buffer passed in as {@code toAppendTo},
      *               with formatted text appended
-     * @throws    NullPointerException if <code>toAppendTo</code> or
-     *            <code>pos</code> is null
+     * @throws    NullPointerException if {@code toAppendTo} or
+     *            {@code pos} is null
      * @throws    IllegalArgumentException if the Format cannot format the given
      *            object
      */
@@ -182,20 +182,20 @@
                     FieldPosition pos);
 
     /**
-     * Formats an Object producing an <code>AttributedCharacterIterator</code>.
-     * You can use the returned <code>AttributedCharacterIterator</code>
+     * Formats an Object producing an {@code AttributedCharacterIterator}.
+     * You can use the returned {@code AttributedCharacterIterator}
      * to build the resulting String, as well as to determine information
      * about the resulting String.
      * <p>
      * Each attribute key of the AttributedCharacterIterator will be of type
-     * <code>Field</code>. It is up to each <code>Format</code> implementation
+     * {@code Field}. It is up to each {@code Format} implementation
      * to define what the legal values are for each attribute in the
-     * <code>AttributedCharacterIterator</code>, but typically the attribute
+     * {@code AttributedCharacterIterator}, but typically the attribute
      * key is also used as the attribute value.
      * <p>The default implementation creates an
-     * <code>AttributedCharacterIterator</code> with no attributes. Subclasses
+     * {@code AttributedCharacterIterator} with no attributes. Subclasses
      * that support fields should override this and create an
-     * <code>AttributedCharacterIterator</code> with meaningful attributes.
+     * {@code AttributedCharacterIterator} with meaningful attributes.
      *
      * @throws    NullPointerException if obj is null.
      * @throws    IllegalArgumentException when the Format cannot format the
@@ -212,20 +212,20 @@
      * Parses text from a string to produce an object.
      * <p>
      * The method attempts to parse text starting at the index given by
-     * <code>pos</code>.
-     * If parsing succeeds, then the index of <code>pos</code> is updated
+     * {@code pos}.
+     * If parsing succeeds, then the index of {@code pos} is updated
      * to the index after the last character used (parsing does not necessarily
      * use all characters up to the end of the string), and the parsed
-     * object is returned. The updated <code>pos</code> can be used to
+     * object is returned. The updated {@code pos} can be used to
      * indicate the starting point for the next call to this method.
-     * If an error occurs, then the index of <code>pos</code> is not
-     * changed, the error index of <code>pos</code> is set to the index of
+     * If an error occurs, then the index of {@code pos} is not
+     * changed, the error index of {@code pos} is set to the index of
      * the character where the error occurred, and null is returned.
      *
-     * @param source A <code>String</code>, part of which should be parsed.
-     * @param pos A <code>ParsePosition</code> object with index and error
+     * @param source A {@code String}, part of which should be parsed.
+     * @param pos A {@code ParsePosition} object with index and error
      *            index information as described above.
-     * @return An <code>Object</code> parsed from the string. In case of
+     * @return An {@code Object} parsed from the string. In case of
      *         error, returns null.
      * @throws NullPointerException if {@code source} or {@code pos} is null.
      */
@@ -235,8 +235,8 @@
      * Parses text from the beginning of the given string to produce an object.
      * The method may not use the entire text of the given string.
      *
-     * @param source A <code>String</code> whose beginning should be parsed.
-     * @return An <code>Object</code> parsed from the string.
+     * @param source A {@code String} whose beginning should be parsed.
+     * @return An {@code Object} parsed from the string.
      * @throws    ParseException if the beginning of the specified string
      *            cannot be parsed.
      * @throws NullPointerException if {@code source} is null.
@@ -271,8 +271,8 @@
     //
 
     /**
-     * Creates an <code>AttributedCharacterIterator</code> for the String
-     * <code>s</code>.
+     * Creates an {@code AttributedCharacterIterator} for the String
+     * {@code s}.
      *
      * @param s String to create AttributedCharacterIterator from
      * @return AttributedCharacterIterator wrapping s
@@ -284,9 +284,9 @@
     }
 
     /**
-     * Creates an <code>AttributedCharacterIterator</code> containing the
+     * Creates an {@code AttributedCharacterIterator} containing the
      * concatenated contents of the passed in
-     * <code>AttributedCharacterIterator</code>s.
+     * {@code AttributedCharacterIterator}s.
      *
      * @param iterators AttributedCharacterIterators used to create resulting
      *                  AttributedCharacterIterators
@@ -302,8 +302,8 @@
 
     /**
      * Returns an AttributedCharacterIterator with the String
-     * <code>string</code> and additional key/value pair <code>key</code>,
-     * <code>value</code>.
+     * {@code string} and additional key/value pair {@code key},
+     * {@code value}.
      *
      * @param string String to create AttributedCharacterIterator from
      * @param key Key for AttributedCharacterIterator
@@ -321,8 +321,8 @@
 
     /**
      * Creates an AttributedCharacterIterator with the contents of
-     * <code>iterator</code> and the additional attribute <code>key</code>
-     * <code>value</code>.
+     * {@code iterator} and the additional attribute {@code key}
+     * {@code value}.
      *
      * @param iterator Initial AttributedCharacterIterator to add arg to
      * @param key Key for AttributedCharacterIterator
@@ -341,9 +341,9 @@
 
     /**
      * Defines constants that are used as attribute keys in the
-     * <code>AttributedCharacterIterator</code> returned
-     * from <code>Format.formatToCharacterIterator</code> and as
-     * field identifiers in <code>FieldPosition</code>.
+     * {@code AttributedCharacterIterator} returned
+     * from {@code Format.formatToCharacterIterator} and as
+     * field identifiers in {@code FieldPosition}.
      *
      * @since 1.4
      */
@@ -365,13 +365,13 @@
 
 
     /**
-     * FieldDelegate is notified by the various <code>Format</code>
+     * FieldDelegate is notified by the various {@code Format}
      * implementations as they are formatting the Objects. This allows for
      * storage of the individual sections of the formatted String for
-     * later use, such as in a <code>FieldPosition</code> or for an
-     * <code>AttributedCharacterIterator</code>.
+     * later use, such as in a {@code FieldPosition} or for an
+     * {@code AttributedCharacterIterator}.
      * <p>
-     * Delegates should NOT assume that the <code>Format</code> will notify
+     * Delegates should NOT assume that the {@code Format} will notify
      * the delegate of fields in any particular order.
      *
      * @see FieldPosition#getFieldDelegate
@@ -381,7 +381,7 @@
         /**
          * Notified when a particular region of the String is formatted. This
          * method will be invoked if there is no corresponding integer field id
-         * matching <code>attr</code>.
+         * matching {@code attr}.
          *
          * @param attr Identifies the field matched
          * @param value Value associated with the field
--- a/src/java.base/share/classes/java/text/MessageFormat.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/MessageFormat.java	Tue Sep 24 09:43:43 2019 +0100
@@ -50,27 +50,27 @@
 
 
 /**
- * <code>MessageFormat</code> provides a means to produce concatenated
+ * {@code MessageFormat} provides a means to produce concatenated
  * messages in a language-neutral way. Use this to construct messages
  * displayed for end users.
  *
  * <p>
- * <code>MessageFormat</code> takes a set of objects, formats them, then
+ * {@code MessageFormat} takes a set of objects, formats them, then
  * inserts the formatted strings into the pattern at the appropriate places.
  *
  * <p>
  * <strong>Note:</strong>
- * <code>MessageFormat</code> differs from the other <code>Format</code>
- * classes in that you create a <code>MessageFormat</code> object with one
- * of its constructors (not with a <code>getInstance</code> style factory
- * method). The factory methods aren't necessary because <code>MessageFormat</code>
+ * {@code MessageFormat} differs from the other {@code Format}
+ * classes in that you create a {@code MessageFormat} object with one
+ * of its constructors (not with a {@code getInstance} style factory
+ * method). The factory methods aren't necessary because {@code MessageFormat}
  * itself doesn't implement locale specific behavior. Any locale specific
  * behavior is defined by the pattern that you provide as well as the
  * subformats used for inserted arguments.
  *
  * <h2><a id="patterns">Patterns and Their Interpretation</a></h2>
  *
- * <code>MessageFormat</code> uses patterns of the following form:
+ * {@code MessageFormat} uses patterns of the following form:
  * <blockquote><pre>
  * <i>MessageFormatPattern:</i>
  *         <i>String</i>
@@ -102,7 +102,7 @@
  * must be represented by doubled single quotes {@code ''} throughout a
  * <i>String</i>.  For example, pattern string <code>"'{''}'"</code> is
  * interpreted as a sequence of <code>'{</code> (start of quoting and a
- * left curly brace), <code>''</code> (a single quote), and
+ * left curly brace), {@code ''} (a single quote), and
  * <code>}'</code> (a right curly brace and end of quoting),
  * <em>not</em> <code>'{'</code> and <code>'}'</code> (quoted left and
  * right curly braces): representing string <code>"{'}"</code>,
@@ -228,8 +228,8 @@
  * static strings will, of course, be obtained from resource bundles.
  * Other parameters will be dynamically determined at runtime.
  * <p>
- * The first example uses the static method <code>MessageFormat.format</code>,
- * which internally creates a <code>MessageFormat</code> for one-time use:
+ * The first example uses the static method {@code MessageFormat.format},
+ * which internally creates a {@code MessageFormat} for one-time use:
  * <blockquote><pre>
  * int planet = 7;
  * String event = "a disturbance in the Force";
@@ -244,7 +244,7 @@
  * </pre></blockquote>
  *
  * <p>
- * The following example creates a <code>MessageFormat</code> instance that
+ * The following example creates a {@code MessageFormat} instance that
  * can be used repeatedly:
  * <blockquote><pre>
  * int fileCount = 1273;
@@ -256,7 +256,7 @@
  *
  * System.out.println(form.format(testArgs));
  * </pre></blockquote>
- * The output with different values for <code>fileCount</code>:
+ * The output with different values for {@code fileCount}:
  * <blockquote><pre>
  * The disk "MyDisk" contains 0 file(s).
  * The disk "MyDisk" contains 1 file(s).
@@ -264,7 +264,7 @@
  * </pre></blockquote>
  *
  * <p>
- * For more sophisticated patterns, you can use a <code>ChoiceFormat</code>
+ * For more sophisticated patterns, you can use a {@code ChoiceFormat}
  * to produce correct forms for singular and plural:
  * <blockquote><pre>
  * MessageFormat form = new MessageFormat("The disk \"{1}\" contains {0}.");
@@ -279,7 +279,7 @@
  *
  * System.out.println(form.format(testArgs));
  * </pre></blockquote>
- * The output with different values for <code>fileCount</code>:
+ * The output with different values for {@code fileCount}:
  * <blockquote><pre>
  * The disk "MyDisk" contains no files.
  * The disk "MyDisk" contains one file.
@@ -287,7 +287,7 @@
  * </pre></blockquote>
  *
  * <p>
- * You can create the <code>ChoiceFormat</code> programmatically, as in the
+ * You can create the {@code ChoiceFormat} programmatically, as in the
  * above example, or by using a pattern. See {@link ChoiceFormat}
  * for more information.
  * <blockquote><pre>{@code
@@ -297,9 +297,9 @@
  *
  * <p>
  * <strong>Note:</strong> As we see above, the string produced
- * by a <code>ChoiceFormat</code> in <code>MessageFormat</code> is treated as special;
+ * by a {@code ChoiceFormat} in {@code MessageFormat} is treated as special;
  * occurrences of '{' are used to indicate subformats, and cause recursion.
- * If you create both a <code>MessageFormat</code> and <code>ChoiceFormat</code>
+ * If you create both a {@code MessageFormat} and {@code ChoiceFormat}
  * programmatically (instead of using the string patterns), then be careful not to
  * produce a format that recurses on itself, which will cause an infinite loop.
  * <p>
@@ -398,8 +398,8 @@
      * <li>to the {@link #applyPattern applyPattern}
      *     and {@link #toPattern toPattern} methods if format elements specify
      *     a format type and therefore have the subformats created in the
-     *     <code>applyPattern</code> method, as well as
-     * <li>to the <code>format</code> and
+     *     {@code applyPattern} method, as well as
+     * <li>to the {@code format} and
      *     {@link #formatToCharacterIterator formatToCharacterIterator} methods
      *     if format elements do not specify a format type and therefore have
      *     the subformats created in the formatting methods.
@@ -596,14 +596,14 @@
 
     /**
      * Sets the formats to use for the values passed into
-     * <code>format</code> methods or returned from <code>parse</code>
-     * methods. The indices of elements in <code>newFormats</code>
+     * {@code format} methods or returned from {@code parse}
+     * methods. The indices of elements in {@code newFormats}
      * correspond to the argument indices used in the previously set
      * pattern string.
-     * The order of formats in <code>newFormats</code> thus corresponds to
-     * the order of elements in the <code>arguments</code> array passed
-     * to the <code>format</code> methods or the result array returned
-     * by the <code>parse</code> methods.
+     * The order of formats in {@code newFormats} thus corresponds to
+     * the order of elements in the {@code arguments} array passed
+     * to the {@code format} methods or the result array returned
+     * by the {@code parse} methods.
      * <p>
      * If an argument index is used for more than one format element
      * in the pattern string, then the corresponding new format is used
@@ -611,10 +611,10 @@
      * for any format element in the pattern string, then the
      * corresponding new format is ignored. If fewer formats are provided
      * than needed, then only the formats for argument indices less
-     * than <code>newFormats.length</code> are replaced.
+     * than {@code newFormats.length} are replaced.
      *
      * @param newFormats the new formats to use
-     * @throws    NullPointerException if <code>newFormats</code> is null
+     * @throws    NullPointerException if {@code newFormats} is null
      * @since 1.4
      */
     public void setFormatsByArgumentIndex(Format[] newFormats) {
@@ -629,24 +629,24 @@
     /**
      * Sets the formats to use for the format elements in the
      * previously set pattern string.
-     * The order of formats in <code>newFormats</code> corresponds to
+     * The order of formats in {@code newFormats} corresponds to
      * the order of format elements in the pattern string.
      * <p>
      * If more formats are provided than needed by the pattern string,
      * the remaining ones are ignored. If fewer formats are provided
-     * than needed, then only the first <code>newFormats.length</code>
+     * than needed, then only the first {@code newFormats.length}
      * formats are replaced.
      * <p>
      * Since the order of format elements in a pattern string often
      * changes during localization, it is generally better to use the
      * {@link #setFormatsByArgumentIndex setFormatsByArgumentIndex}
      * method, which assumes an order of formats corresponding to the
-     * order of elements in the <code>arguments</code> array passed to
-     * the <code>format</code> methods or the result array returned by
-     * the <code>parse</code> methods.
+     * order of elements in the {@code arguments} array passed to
+     * the {@code format} methods or the result array returned by
+     * the {@code parse} methods.
      *
      * @param newFormats the new formats to use
-     * @throws    NullPointerException if <code>newFormats</code> is null
+     * @throws    NullPointerException if {@code newFormats} is null
      */
     public void setFormats(Format[] newFormats) {
         int runsToCopy = newFormats.length;
@@ -663,9 +663,9 @@
      * previously set pattern string that use the given argument
      * index.
      * The argument index is part of the format element definition and
-     * represents an index into the <code>arguments</code> array passed
-     * to the <code>format</code> methods or the result array returned
-     * by the <code>parse</code> methods.
+     * represents an index into the {@code arguments} array passed
+     * to the {@code format} methods or the result array returned
+     * by the {@code parse} methods.
      * <p>
      * If the argument index is used for more than one format element
      * in the pattern string, then the new format is used for all such
@@ -711,14 +711,14 @@
 
     /**
      * Gets the formats used for the values passed into
-     * <code>format</code> methods or returned from <code>parse</code>
+     * {@code format} methods or returned from {@code parse}
      * methods. The indices of elements in the returned array
      * correspond to the argument indices used in the previously set
      * pattern string.
      * The order of formats in the returned array thus corresponds to
-     * the order of elements in the <code>arguments</code> array passed
-     * to the <code>format</code> methods or the result array returned
-     * by the <code>parse</code> methods.
+     * the order of elements in the {@code arguments} array passed
+     * to the {@code format} methods or the result array returned
+     * by the {@code parse} methods.
      * <p>
      * If an argument index is used for more than one format element
      * in the pattern string, then the format used for the last such
@@ -753,9 +753,9 @@
      * changes during localization, it's generally better to use the
      * {@link #getFormatsByArgumentIndex getFormatsByArgumentIndex}
      * method, which assumes an order of formats corresponding to the
-     * order of elements in the <code>arguments</code> array passed to
-     * the <code>format</code> methods or the result array returned by
-     * the <code>parse</code> methods.
+     * order of elements in the {@code arguments} array passed to
+     * the {@code format} methods or the result array returned by
+     * the {@code parse} methods.
      *
      * @return the formats used for the format elements in the pattern
      */
@@ -766,16 +766,16 @@
     }
 
     /**
-     * Formats an array of objects and appends the <code>MessageFormat</code>'s
+     * Formats an array of objects and appends the {@code MessageFormat}'s
      * pattern, with format elements replaced by the formatted objects, to the
-     * provided <code>StringBuffer</code>.
+     * provided {@code StringBuffer}.
      * <p>
      * The text substituted for the individual format elements is derived from
      * the current subformat of the format element and the
-     * <code>arguments</code> element at the format element's argument index
+     * {@code arguments} element at the format element's argument index
      * as indicated by the first matching line of the following table. An
-     * argument is <i>unavailable</i> if <code>arguments</code> is
-     * <code>null</code> or has fewer than argumentIndex+1 elements.
+     * argument is <i>unavailable</i> if {@code arguments} is
+     * {@code null} or has fewer than argumentIndex+1 elements.
      *
      * <table class="plain">
      * <caption style="display:none">Examples of subformat,argument,and formatted text</caption>
@@ -791,36 +791,36 @@
      *       <th scope="row" style="text-weight-normal"><i>unavailable</i>
      *       <td><code>"{" + argumentIndex + "}"</code>
      *    <tr>
-     *       <th scope="row" style="text-weight-normal"><code>null</code>
-     *       <td><code>"null"</code>
+     *       <th scope="row" style="text-weight-normal">{@code null}
+     *       <td>{@code "null"}
      *    <tr>
-     *       <th scope="row" style="text-weight-normal"><code>instanceof ChoiceFormat</code>
+     *       <th scope="row" style="text-weight-normal">{@code instanceof ChoiceFormat}
      *       <th scope="row" style="text-weight-normal"><i>any</i>
      *       <td><code>subformat.format(argument).indexOf('{') &gt;= 0 ?<br>
      *           (new MessageFormat(subformat.format(argument), getLocale())).format(argument) :
      *           subformat.format(argument)</code>
      *    <tr>
-     *       <th scope="row" style="text-weight-normal"><code>!= null</code>
+     *       <th scope="row" style="text-weight-normal">{@code != null}
      *       <th scope="row" style="text-weight-normal"><i>any</i>
-     *       <td><code>subformat.format(argument)</code>
+     *       <td>{@code subformat.format(argument)}
      *    <tr>
-     *       <th scope="row" style="text-weight-normal" rowspan=4><code>null</code>
-     *       <th scope="row" style="text-weight-normal"><code>instanceof Number</code>
-     *       <td><code>NumberFormat.getInstance(getLocale()).format(argument)</code>
+     *       <th scope="row" style="text-weight-normal" rowspan=4>{@code null}
+     *       <th scope="row" style="text-weight-normal">{@code instanceof Number}
+     *       <td>{@code NumberFormat.getInstance(getLocale()).format(argument)}
      *    <tr>
-     *       <th scope="row" style="text-weight-normal"><code>instanceof Date</code>
-     *       <td><code>DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, getLocale()).format(argument)</code>
+     *       <th scope="row" style="text-weight-normal">{@code instanceof Date}
+     *       <td>{@code DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, getLocale()).format(argument)}
      *    <tr>
-     *       <th scope="row" style="text-weight-normal"><code>instanceof String</code>
-     *       <td><code>argument</code>
+     *       <th scope="row" style="text-weight-normal">{@code instanceof String}
+     *       <td>{@code argument}
      *    <tr>
      *       <th scope="row" style="text-weight-normal"><i>any</i>
-     *       <td><code>argument.toString()</code>
+     *       <td>{@code argument.toString()}
      * </tbody>
      * </table>
      * <p>
-     * If <code>pos</code> is non-null, and refers to
-     * <code>Field.ARGUMENT</code>, the location of the first formatted
+     * If {@code pos} is non-null, and refers to
+     * {@code Field.ARGUMENT}, the location of the first formatted
      * string will be returned.
      *
      * @param arguments an array of objects to be formatted and substituted.
@@ -830,7 +830,7 @@
      * @return the string buffer passed in as {@code result}, with formatted
      * text appended
      * @throws    IllegalArgumentException if an argument in the
-     *            <code>arguments</code> array is not of the type
+     *            {@code arguments} array is not of the type
      *            expected by the format element(s) that use it.
      * @throws    NullPointerException if {@code result} is {@code null}
      */
@@ -851,7 +851,7 @@
      * @param arguments object(s) to format
      * @return the formatted string
      * @throws    IllegalArgumentException if the pattern is invalid,
-     *            or if an argument in the <code>arguments</code> array
+     *            or if an argument in the {@code arguments} array
      *            is not of the type expected by the format element(s)
      *            that use it.
      * @throws    NullPointerException if {@code pattern} is {@code null}
@@ -863,9 +863,9 @@
 
     // Overrides
     /**
-     * Formats an array of objects and appends the <code>MessageFormat</code>'s
+     * Formats an array of objects and appends the {@code MessageFormat}'s
      * pattern, with format elements replaced by the formatted objects, to the
-     * provided <code>StringBuffer</code>.
+     * provided {@code StringBuffer}.
      * This is equivalent to
      * <blockquote>
      *     <code>{@link #format(java.lang.Object[], java.lang.StringBuffer, java.text.FieldPosition) format}((Object[]) arguments, result, pos)</code>
@@ -876,7 +876,7 @@
      * @param pos keeps track on the position of the first replaced argument
      *            in the output string.
      * @throws    IllegalArgumentException if an argument in the
-     *            <code>arguments</code> array is not of the type
+     *            {@code arguments} array is not of the type
      *            expected by the format element(s) that use it.
      * @throws    NullPointerException if {@code result} is {@code null}
      */
@@ -888,36 +888,36 @@
 
     /**
      * Formats an array of objects and inserts them into the
-     * <code>MessageFormat</code>'s pattern, producing an
-     * <code>AttributedCharacterIterator</code>.
-     * You can use the returned <code>AttributedCharacterIterator</code>
+     * {@code MessageFormat}'s pattern, producing an
+     * {@code AttributedCharacterIterator}.
+     * You can use the returned {@code AttributedCharacterIterator}
      * to build the resulting String, as well as to determine information
      * about the resulting String.
      * <p>
-     * The text of the returned <code>AttributedCharacterIterator</code> is
+     * The text of the returned {@code AttributedCharacterIterator} is
      * the same that would be returned by
      * <blockquote>
      *     <code>{@link #format(java.lang.Object[], java.lang.StringBuffer, java.text.FieldPosition) format}(arguments, new StringBuffer(), null).toString()</code>
      * </blockquote>
      * <p>
-     * In addition, the <code>AttributedCharacterIterator</code> contains at
+     * In addition, the {@code AttributedCharacterIterator} contains at
      * least attributes indicating where text was generated from an
-     * argument in the <code>arguments</code> array. The keys of these attributes are of
-     * type <code>MessageFormat.Field</code>, their values are
-     * <code>Integer</code> objects indicating the index in the <code>arguments</code>
+     * argument in the {@code arguments} array. The keys of these attributes are of
+     * type {@code MessageFormat.Field}, their values are
+     * {@code Integer} objects indicating the index in the {@code arguments}
      * array of the argument from which the text was generated.
      * <p>
-     * The attributes/value from the underlying <code>Format</code>
-     * instances that <code>MessageFormat</code> uses will also be
-     * placed in the resulting <code>AttributedCharacterIterator</code>.
+     * The attributes/value from the underlying {@code Format}
+     * instances that {@code MessageFormat} uses will also be
+     * placed in the resulting {@code AttributedCharacterIterator}.
      * This allows you to not only find where an argument is placed in the
      * resulting String, but also which fields it contains in turn.
      *
      * @param arguments an array of objects to be formatted and substituted.
      * @return AttributedCharacterIterator describing the formatted value.
-     * @throws    NullPointerException if <code>arguments</code> is null.
+     * @throws    NullPointerException if {@code arguments} is null.
      * @throws    IllegalArgumentException if an argument in the
-     *            <code>arguments</code> array is not of the type
+     *            {@code arguments} array is not of the type
      *            expected by the format element(s) that use it.
      * @since 1.4
      */
@@ -1055,8 +1055,8 @@
      * See the {@link #parse(String, ParsePosition)} method for more information
      * on message parsing.
      *
-     * @param source A <code>String</code> whose beginning should be parsed.
-     * @return An <code>Object</code> array parsed from the string.
+     * @param source A {@code String} whose beginning should be parsed.
+     * @return An {@code Object} array parsed from the string.
      * @throws    ParseException if the beginning of the specified string
      *            cannot be parsed.
      */
@@ -1073,23 +1073,23 @@
      * Parses text from a string to produce an object array.
      * <p>
      * The method attempts to parse text starting at the index given by
-     * <code>pos</code>.
-     * If parsing succeeds, then the index of <code>pos</code> is updated
+     * {@code pos}.
+     * If parsing succeeds, then the index of {@code pos} is updated
      * to the index after the last character used (parsing does not necessarily
      * use all characters up to the end of the string), and the parsed
-     * object array is returned. The updated <code>pos</code> can be used to
+     * object array is returned. The updated {@code pos} can be used to
      * indicate the starting point for the next call to this method.
-     * If an error occurs, then the index of <code>pos</code> is not
-     * changed, the error index of <code>pos</code> is set to the index of
+     * If an error occurs, then the index of {@code pos} is not
+     * changed, the error index of {@code pos} is set to the index of
      * the character where the error occurred, and null is returned.
      * <p>
      * See the {@link #parse(String, ParsePosition)} method for more information
      * on message parsing.
      *
-     * @param source A <code>String</code>, part of which should be parsed.
-     * @param pos A <code>ParsePosition</code> object with index and error
+     * @param source A {@code String}, part of which should be parsed.
+     * @param pos A {@code ParsePosition} object with index and error
      *            index information as described above.
-     * @return An <code>Object</code> array parsed from the string. In case of
+     * @return An {@code Object} array parsed from the string. In case of
      *         error, returns null.
      * @throws NullPointerException if {@code pos} is null.
      */
@@ -1146,8 +1146,8 @@
 
     /**
      * Defines constants that are used as attribute keys in the
-     * <code>AttributedCharacterIterator</code> returned
-     * from <code>MessageFormat.formatToCharacterIterator</code>.
+     * {@code AttributedCharacterIterator} returned
+     * from {@code MessageFormat.formatToCharacterIterator}.
      *
      * @since 1.4
      */
@@ -1188,9 +1188,9 @@
 
         /**
          * Constant identifying a portion of a message that was generated
-         * from an argument passed into <code>formatToCharacterIterator</code>.
-         * The value associated with the key will be an <code>Integer</code>
-         * indicating the index in the <code>arguments</code> array of the
+         * from an argument passed into {@code formatToCharacterIterator}.
+         * The value associated with the key will be an {@code Integer}
+         * indicating the index in the {@code arguments} array of the
          * argument from which the text was generated.
          */
         public static final Field ARGUMENT =
@@ -1237,9 +1237,9 @@
     private int[] argumentNumbers = new int[INITIAL_FORMATS];
 
     /**
-     * One less than the number of entries in <code>offsets</code>.  Can also be thought of
-     * as the index of the highest-numbered element in <code>offsets</code> that is being used.
-     * All of these arrays should have the same number of elements being used as <code>offsets</code>
+     * One less than the number of entries in {@code offsets}.  Can also be thought of
+     * as the index of the highest-numbered element in {@code offsets} that is being used.
+     * All of these arrays should have the same number of elements being used as {@code offsets}
      * does, and so this variable suffices to tell us how many entries are in all of them.
      * @serial
      */
@@ -1254,7 +1254,7 @@
      * the first replaced argument will be set in it.
      *
      * @throws    IllegalArgumentException if an argument in the
-     *            <code>arguments</code> array is not of the type
+     *            {@code arguments} array is not of the type
      *            expected by the format element(s) that use it.
      */
     private StringBuffer subformat(Object[] arguments, StringBuffer result,
@@ -1367,7 +1367,7 @@
 
     /**
      * Convenience method to append all the characters in
-     * <code>iterator</code> to the StringBuffer <code>result</code>.
+     * {@code iterator} to the StringBuffer {@code result}.
      */
     private void append(StringBuffer result, CharacterIterator iterator) {
         if (iterator.first() != CharacterIterator.DONE) {
--- a/src/java.base/share/classes/java/text/Normalizer.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/Normalizer.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,10 +40,10 @@
 import sun.text.normalizer.NormalizerBase;
 
 /**
- * This class provides the method <code>normalize</code> which transforms Unicode
+ * This class provides the method {@code normalize} which transforms Unicode
  * text into an equivalent composed or decomposed form, allowing for easier
  * sorting and searching of text.
- * The <code>normalize</code> method supports the standard normalization forms
+ * The {@code normalize} method supports the standard normalization forms
  * described in
  * <a href="http://www.unicode.org/unicode/reports/tr15/tr15-23.html">
  * Unicode Standard Annex #15 &mdash; Unicode Normalization Forms</a>.
@@ -88,12 +88,12 @@
  * into the corresponding semantic characters.  When sorting and searching, you
  * will often want to use these mappings.
  * <p>
- * The <code>normalize</code> method helps solve these problems by transforming
+ * The {@code normalize} method helps solve these problems by transforming
  * text into the canonical composed and decomposed forms as shown in the first
  * example above. In addition, you can have it perform compatibility
  * decompositions so that you can treat compatibility characters the same as
  * their equivalents.
- * Finally, the <code>normalize</code> method rearranges accents into the
+ * Finally, the {@code normalize} method rearranges accents into the
  * proper canonical order, so that you do not have to worry about accent
  * rearrangement on your own.
  * <p>
@@ -152,7 +152,7 @@
      *                   {@link java.text.Normalizer.Form#NFKC},
      *                   {@link java.text.Normalizer.Form#NFKD}
      * @return The normalized String
-     * @throws NullPointerException If <code>src</code> or <code>form</code>
+     * @throws NullPointerException If {@code src} or {@code form}
      * is null.
      */
     public static String normalize(CharSequence src, Form form) {
@@ -169,7 +169,7 @@
      *                   {@link java.text.Normalizer.Form#NFKD}
      * @return true if the sequence of char values is normalized;
      * false otherwise.
-     * @throws NullPointerException If <code>src</code> or <code>form</code>
+     * @throws NullPointerException If {@code src} or {@code form}
      * is null.
      */
     public static boolean isNormalized(CharSequence src, Form form) {
--- a/src/java.base/share/classes/java/text/NumberFormat.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/NumberFormat.java	Tue Sep 24 09:43:43 2019 +0100
@@ -56,13 +56,13 @@
 import sun.util.locale.provider.LocaleServiceProviderPool;
 
 /**
- * <code>NumberFormat</code> is the abstract base class for all number
+ * {@code NumberFormat} is the abstract base class for all number
  * formats. This class provides the interface for formatting and parsing
- * numbers. <code>NumberFormat</code> also provides methods for determining
+ * numbers. {@code NumberFormat} also provides methods for determining
  * which locales have number formats, and what their names are.
  *
  * <p>
- * <code>NumberFormat</code> helps you to format and parse numbers for any locale.
+ * {@code NumberFormat} helps you to format and parse numbers for any locale.
  * Your code can be completely independent of the locale conventions for
  * decimal points, thousands-separators, or even the particular decimal
  * digits used, or whether the number format is even decimal.
@@ -88,7 +88,7 @@
  * }</pre>
  * </blockquote>
  * To format a number for a different Locale, specify it in the
- * call to <code>getInstance</code>.
+ * call to {@code getInstance}.
  * <blockquote>
  * <pre>{@code
  * NumberFormat nf = NumberFormat.getInstance(Locale.FRENCH);
@@ -107,25 +107,25 @@
  * myNumber = nf.parse(myString);
  * }</pre>
  * </blockquote>
- * Use <code>getInstance</code> or <code>getNumberInstance</code> to get the
- * normal number format. Use <code>getIntegerInstance</code> to get an
- * integer number format. Use <code>getCurrencyInstance</code> to get the
+ * Use {@code getInstance} or {@code getNumberInstance} to get the
+ * normal number format. Use {@code getIntegerInstance} to get an
+ * integer number format. Use {@code getCurrencyInstance} to get the
  * currency number format. Use {@code getCompactNumberInstance} to get the
  * compact number format to format a number in shorter form. For example,
  * {@code 2000} can be formatted as {@code "2K"} in
- * {@link java.util.Locale#US US locale}. Use <code>getPercentInstance</code>
+ * {@link java.util.Locale#US US locale}. Use {@code getPercentInstance}
  * to get a format for displaying percentages. With this format, a fraction
  * like 0.53 is displayed as 53%.
  *
  * <p>
  * You can also control the display of numbers with such methods as
- * <code>setMinimumFractionDigits</code>.
+ * {@code setMinimumFractionDigits}.
  * If you want even more control over the format or parsing,
  * or want to give your users more control,
- * you can try casting the <code>NumberFormat</code> you get from the factory methods
+ * you can try casting the {@code NumberFormat} you get from the factory methods
  * to a {@code DecimalFormat} or {@code CompactNumberFormat} depending on
  * the factory method used. This will work for the vast majority of locales;
- * just remember to put it in a <code>try</code> block in case you encounter
+ * just remember to put it in a {@code try} block in case you encounter
  * an unusual one.
  *
  * <p>
@@ -149,8 +149,8 @@
  * point, use setParseIntegerOnly.
  *
  * <p>
- * You can also use forms of the <code>parse</code> and <code>format</code>
- * methods with <code>ParsePosition</code> and <code>FieldPosition</code> to
+ * You can also use forms of the {@code parse} and {@code format}
+ * methods with {@code ParsePosition} and {@code FieldPosition} to
  * allow you to:
  * <ul>
  * <li> progressively parse through pieces of a string
@@ -159,15 +159,15 @@
  * For example, you can align numbers in two ways:
  * <ol>
  * <li> If you are using a monospaced font with spacing for alignment,
- *      you can pass the <code>FieldPosition</code> in your format call, with
- *      <code>field</code> = <code>INTEGER_FIELD</code>. On output,
- *      <code>getEndIndex</code> will be set to the offset between the
+ *      you can pass the {@code FieldPosition} in your format call, with
+ *      {@code field} = {@code INTEGER_FIELD}. On output,
+ *      {@code getEndIndex} will be set to the offset between the
  *      last character of the integer and the decimal. Add
  *      (desiredSpaceCount - getEndIndex) spaces at the front of the string.
  *
  * <li> If you are using proportional fonts,
  *      instead of padding with spaces, measure the width
- *      of the string in pixels from the start to <code>getEndIndex</code>.
+ *      of the string in pixels from the start to {@code getEndIndex}.
  *      Then move the pen by
  *      (desiredPixelWidth - widthToAlignmentPoint) before drawing the text.
  *      It also works where there is no decimal, but possibly additional
@@ -238,17 +238,17 @@
      * <p>
      * This implementation extracts the number's value using
      * {@link java.lang.Number#longValue()} for all integral type values that
-     * can be converted to <code>long</code> without loss of information,
-     * including <code>BigInteger</code> values with a
+     * can be converted to {@code long} without loss of information,
+     * including {@code BigInteger} values with a
      * {@link java.math.BigInteger#bitLength() bit length} of less than 64,
      * and {@link java.lang.Number#doubleValue()} for all other types. It
      * then calls
      * {@link #format(long,java.lang.StringBuffer,java.text.FieldPosition)}
      * or {@link #format(double,java.lang.StringBuffer,java.text.FieldPosition)}.
      * This may result in loss of magnitude information and precision for
-     * <code>BigInteger</code> and <code>BigDecimal</code> values.
+     * {@code BigInteger} and {@code BigDecimal} values.
      * @param number     the number to format
-     * @param toAppendTo the <code>StringBuffer</code> to which the formatted
+     * @param toAppendTo the {@code StringBuffer} to which the formatted
      *                   text is to be appended
      * @param pos        keeps track on the position of the field within the
      *                   returned string. For example, for formatting a number
@@ -258,11 +258,11 @@
      *                   and end index of {@code fieldPosition} will be set
      *                   to 0 and 9, respectively for the output string
      *                   {@code 1,234,567.89}.
-     * @return           the value passed in as <code>toAppendTo</code>
-     * @throws           IllegalArgumentException if <code>number</code> is
-     *                   null or not an instance of <code>Number</code>.
-     * @throws           NullPointerException if <code>toAppendTo</code> or
-     *                   <code>pos</code> is null
+     * @return           the value passed in as {@code toAppendTo}
+     * @throws           IllegalArgumentException if {@code number} is
+     *                   null or not an instance of {@code Number}.
+     * @throws           NullPointerException if {@code toAppendTo} or
+     *                   {@code pos} is null
      * @throws           ArithmeticException if rounding is needed with rounding
      *                   mode being set to RoundingMode.UNNECESSARY
      * @see              java.text.FieldPosition
@@ -285,26 +285,26 @@
     }
 
     /**
-     * Parses text from a string to produce a <code>Number</code>.
+     * Parses text from a string to produce a {@code Number}.
      * <p>
      * The method attempts to parse text starting at the index given by
-     * <code>pos</code>.
-     * If parsing succeeds, then the index of <code>pos</code> is updated
+     * {@code pos}.
+     * If parsing succeeds, then the index of {@code pos} is updated
      * to the index after the last character used (parsing does not necessarily
      * use all characters up to the end of the string), and the parsed
-     * number is returned. The updated <code>pos</code> can be used to
+     * number is returned. The updated {@code pos} can be used to
      * indicate the starting point for the next call to this method.
-     * If an error occurs, then the index of <code>pos</code> is not
-     * changed, the error index of <code>pos</code> is set to the index of
+     * If an error occurs, then the index of {@code pos} is not
+     * changed, the error index of {@code pos} is set to the index of
      * the character where the error occurred, and null is returned.
      * <p>
      * See the {@link #parse(String, ParsePosition)} method for more information
      * on number parsing.
      *
-     * @param source A <code>String</code>, part of which should be parsed.
-     * @param pos A <code>ParsePosition</code> object with index and error
+     * @param source A {@code String}, part of which should be parsed.
+     * @param pos A {@code ParsePosition} object with index and error
      *            index information as described above.
-     * @return A <code>Number</code> parsed from the string. In case of
+     * @return A {@code Number} parsed from the string. In case of
      *         error, returns null.
      * @throws NullPointerException if {@code source} or {@code pos} is null.
      */
@@ -422,8 +422,8 @@
      * See the {@link #parse(String, ParsePosition)} method for more information
      * on number parsing.
      *
-     * @param source A <code>String</code> whose beginning should be parsed.
-     * @return A <code>Number</code> parsed from the string.
+     * @param source A {@code String} whose beginning should be parsed.
+     * @return A {@code Number} parsed from the string.
      * @throws    ParseException if the beginning of the specified string
      *            cannot be parsed.
      */
@@ -677,16 +677,16 @@
 
     /**
      * Returns an array of all locales for which the
-     * <code>get*Instance</code> methods of this class can return
+     * {@code get*Instance} methods of this class can return
      * localized instances.
      * The returned array represents the union of locales supported by the Java
      * runtime and by installed
      * {@link java.text.spi.NumberFormatProvider NumberFormatProvider} implementations.
-     * It must contain at least a <code>Locale</code> instance equal to
+     * It must contain at least a {@code Locale} instance equal to
      * {@link java.util.Locale#US Locale.US}.
      *
      * @return An array of locales for which localized
-     *         <code>NumberFormat</code> instances are available.
+     *         {@code NumberFormat} instances are available.
      */
     public static Locale[] getAvailableLocales() {
         LocaleServiceProviderPool pool =
@@ -888,9 +888,9 @@
      * {@link #setCurrency(java.util.Currency) setCurrency}.
      * <p>
      * The default implementation throws
-     * <code>UnsupportedOperationException</code>.
+     * {@code UnsupportedOperationException}.
      *
-     * @return the currency used by this number format, or <code>null</code>
+     * @return the currency used by this number format, or {@code null}
      * @throws    UnsupportedOperationException if the number format class
      * doesn't implement currency formatting
      * @since 1.4
@@ -905,12 +905,12 @@
      * number of fraction digits used by the number format.
      * <p>
      * The default implementation throws
-     * <code>UnsupportedOperationException</code>.
+     * {@code UnsupportedOperationException}.
      *
      * @param currency the new currency to be used by this number format
      * @throws    UnsupportedOperationException if the number format class
      * doesn't implement currency formatting
-     * @throws    NullPointerException if <code>currency</code> is null
+     * @throws    NullPointerException if {@code currency} is null
      * @since 1.4
      */
     public void setCurrency(Currency currency) {
@@ -926,7 +926,7 @@
      *
      * @throws    UnsupportedOperationException The default implementation
      *     always throws this exception
-     * @return The <code>RoundingMode</code> used for this NumberFormat.
+     * @return The {@code RoundingMode} used for this NumberFormat.
      * @see #setRoundingMode(RoundingMode)
      * @since 1.6
      */
@@ -943,8 +943,8 @@
      *
      * @throws    UnsupportedOperationException The default implementation
      *     always throws this exception
-     * @throws    NullPointerException if <code>roundingMode</code> is null
-     * @param roundingMode The <code>RoundingMode</code> to be used
+     * @throws    NullPointerException if {@code roundingMode} is null
+     * @param roundingMode The {@code RoundingMode} to be used
      * @see #getRoundingMode()
      * @since 1.6
      */
@@ -996,20 +996,20 @@
     /**
      * First, read in the default serializable data.
      *
-     * Then, if <code>serialVersionOnStream</code> is less than 1, indicating that
+     * Then, if {@code serialVersionOnStream} is less than 1, indicating that
      * the stream was written by JDK 1.1,
-     * set the <code>int</code> fields such as <code>maximumIntegerDigits</code>
-     * to be equal to the <code>byte</code> fields such as <code>maxIntegerDigits</code>,
-     * since the <code>int</code> fields were not present in JDK 1.1.
+     * set the {@code int} fields such as {@code maximumIntegerDigits}
+     * to be equal to the {@code byte} fields such as {@code maxIntegerDigits},
+     * since the {@code int} fields were not present in JDK 1.1.
      * Finally, set serialVersionOnStream back to the maximum allowed value so that
      * default serialization will work properly if this object is streamed out again.
      *
-     * <p>If <code>minimumIntegerDigits</code> is greater than
-     * <code>maximumIntegerDigits</code> or <code>minimumFractionDigits</code>
-     * is greater than <code>maximumFractionDigits</code>, then the stream data
-     * is invalid and this method throws an <code>InvalidObjectException</code>.
+     * <p>If {@code minimumIntegerDigits} is greater than
+     * {@code maximumIntegerDigits} or {@code minimumFractionDigits}
+     * is greater than {@code maximumFractionDigits}, then the stream data
+     * is invalid and this method throws an {@code InvalidObjectException}.
      * In addition, if any of these values is negative, then this method throws
-     * an <code>InvalidObjectException</code>.
+     * an {@code InvalidObjectException}.
      *
      * @since 1.2
      */
@@ -1035,9 +1035,9 @@
 
     /**
      * Write out the default serializable data, after first setting
-     * the <code>byte</code> fields such as <code>maxIntegerDigits</code> to be
-     * equal to the <code>int</code> fields such as <code>maximumIntegerDigits</code>
-     * (or to <code>Byte.MAX_VALUE</code>, whichever is smaller), for compatibility
+     * the {@code byte} fields such as {@code maxIntegerDigits} to be
+     * equal to the {@code int} fields such as {@code maximumIntegerDigits}
+     * (or to {@code Byte.MAX_VALUE}, whichever is smaller), for compatibility
      * with the JDK 1.1 version of the stream format.
      *
      * @since 1.2
@@ -1076,16 +1076,16 @@
 
     /**
      * The maximum number of digits allowed in the integer portion of a
-     * number.  <code>maxIntegerDigits</code> must be greater than or equal to
-     * <code>minIntegerDigits</code>.
+     * number.  {@code maxIntegerDigits} must be greater than or equal to
+     * {@code minIntegerDigits}.
      * <p>
      * <strong>Note:</strong> This field exists only for serialization
      * compatibility with JDK 1.1.  In Java platform 2 v1.2 and higher, the new
-     * <code>int</code> field <code>maximumIntegerDigits</code> is used instead.
-     * When writing to a stream, <code>maxIntegerDigits</code> is set to
-     * <code>maximumIntegerDigits</code> or <code>Byte.MAX_VALUE</code>,
+     * {@code int} field {@code maximumIntegerDigits} is used instead.
+     * When writing to a stream, {@code maxIntegerDigits} is set to
+     * {@code maximumIntegerDigits} or {@code Byte.MAX_VALUE},
      * whichever is smaller.  When reading from a stream, this field is used
-     * only if <code>serialVersionOnStream</code> is less than 1.
+     * only if {@code serialVersionOnStream} is less than 1.
      *
      * @serial
      * @see #getMaximumIntegerDigits
@@ -1094,16 +1094,16 @@
 
     /**
      * The minimum number of digits allowed in the integer portion of a
-     * number.  <code>minimumIntegerDigits</code> must be less than or equal to
-     * <code>maximumIntegerDigits</code>.
+     * number.  {@code minimumIntegerDigits} must be less than or equal to
+     * {@code maximumIntegerDigits}.
      * <p>
      * <strong>Note:</strong> This field exists only for serialization
      * compatibility with JDK 1.1.  In Java platform 2 v1.2 and higher, the new
-     * <code>int</code> field <code>minimumIntegerDigits</code> is used instead.
-     * When writing to a stream, <code>minIntegerDigits</code> is set to
-     * <code>minimumIntegerDigits</code> or <code>Byte.MAX_VALUE</code>,
+     * {@code int} field {@code minimumIntegerDigits} is used instead.
+     * When writing to a stream, {@code minIntegerDigits} is set to
+     * {@code minimumIntegerDigits} or {@code Byte.MAX_VALUE},
      * whichever is smaller.  When reading from a stream, this field is used
-     * only if <code>serialVersionOnStream</code> is less than 1.
+     * only if {@code serialVersionOnStream} is less than 1.
      *
      * @serial
      * @see #getMinimumIntegerDigits
@@ -1112,16 +1112,16 @@
 
     /**
      * The maximum number of digits allowed in the fractional portion of a
-     * number.  <code>maximumFractionDigits</code> must be greater than or equal to
-     * <code>minimumFractionDigits</code>.
+     * number.  {@code maximumFractionDigits} must be greater than or equal to
+     * {@code minimumFractionDigits}.
      * <p>
      * <strong>Note:</strong> This field exists only for serialization
      * compatibility with JDK 1.1.  In Java platform 2 v1.2 and higher, the new
-     * <code>int</code> field <code>maximumFractionDigits</code> is used instead.
-     * When writing to a stream, <code>maxFractionDigits</code> is set to
-     * <code>maximumFractionDigits</code> or <code>Byte.MAX_VALUE</code>,
+     * {@code int} field {@code maximumFractionDigits} is used instead.
+     * When writing to a stream, {@code maxFractionDigits} is set to
+     * {@code maximumFractionDigits} or {@code Byte.MAX_VALUE},
      * whichever is smaller.  When reading from a stream, this field is used
-     * only if <code>serialVersionOnStream</code> is less than 1.
+     * only if {@code serialVersionOnStream} is less than 1.
      *
      * @serial
      * @see #getMaximumFractionDigits
@@ -1130,16 +1130,16 @@
 
     /**
      * The minimum number of digits allowed in the fractional portion of a
-     * number.  <code>minimumFractionDigits</code> must be less than or equal to
-     * <code>maximumFractionDigits</code>.
+     * number.  {@code minimumFractionDigits} must be less than or equal to
+     * {@code maximumFractionDigits}.
      * <p>
      * <strong>Note:</strong> This field exists only for serialization
      * compatibility with JDK 1.1.  In Java platform 2 v1.2 and higher, the new
-     * <code>int</code> field <code>minimumFractionDigits</code> is used instead.
-     * When writing to a stream, <code>minFractionDigits</code> is set to
-     * <code>minimumFractionDigits</code> or <code>Byte.MAX_VALUE</code>,
+     * {@code int} field {@code minimumFractionDigits} is used instead.
+     * When writing to a stream, {@code minFractionDigits} is set to
+     * {@code minimumFractionDigits} or {@code Byte.MAX_VALUE},
      * whichever is smaller.  When reading from a stream, this field is used
-     * only if <code>serialVersionOnStream</code> is less than 1.
+     * only if {@code serialVersionOnStream} is less than 1.
      *
      * @serial
      * @see #getMinimumFractionDigits
@@ -1158,8 +1158,8 @@
 
     /**
      * The maximum number of digits allowed in the integer portion of a
-     * number.  <code>maximumIntegerDigits</code> must be greater than or equal to
-     * <code>minimumIntegerDigits</code>.
+     * number.  {@code maximumIntegerDigits} must be greater than or equal to
+     * {@code minimumIntegerDigits}.
      *
      * @serial
      * @since 1.2
@@ -1169,8 +1169,8 @@
 
     /**
      * The minimum number of digits allowed in the integer portion of a
-     * number.  <code>minimumIntegerDigits</code> must be less than or equal to
-     * <code>maximumIntegerDigits</code>.
+     * number.  {@code minimumIntegerDigits} must be less than or equal to
+     * {@code maximumIntegerDigits}.
      *
      * @serial
      * @since 1.2
@@ -1180,8 +1180,8 @@
 
     /**
      * The maximum number of digits allowed in the fractional portion of a
-     * number.  <code>maximumFractionDigits</code> must be greater than or equal to
-     * <code>minimumFractionDigits</code>.
+     * number.  {@code maximumFractionDigits} must be greater than or equal to
+     * {@code minimumFractionDigits}.
      *
      * @serial
      * @since 1.2
@@ -1191,8 +1191,8 @@
 
     /**
      * The minimum number of digits allowed in the fractional portion of a
-     * number.  <code>minimumFractionDigits</code> must be less than or equal to
-     * <code>maximumFractionDigits</code>.
+     * number.  {@code minimumFractionDigits} must be less than or equal to
+     * {@code maximumFractionDigits}.
      *
      * @serial
      * @since 1.2
@@ -1203,21 +1203,21 @@
     static final int currentSerialVersion = 1;
 
     /**
-     * Describes the version of <code>NumberFormat</code> present on the stream.
+     * Describes the version of {@code NumberFormat} present on the stream.
      * Possible values are:
      * <ul>
      * <li><b>0</b> (or uninitialized): the JDK 1.1 version of the stream format.
-     *     In this version, the <code>int</code> fields such as
-     *     <code>maximumIntegerDigits</code> were not present, and the <code>byte</code>
-     *     fields such as <code>maxIntegerDigits</code> are used instead.
+     *     In this version, the {@code int} fields such as
+     *     {@code maximumIntegerDigits} were not present, and the {@code byte}
+     *     fields such as {@code maxIntegerDigits} are used instead.
      *
      * <li><b>1</b>: the 1.2 version of the stream format.  The values of the
-     *     <code>byte</code> fields such as <code>maxIntegerDigits</code> are ignored,
-     *     and the <code>int</code> fields such as <code>maximumIntegerDigits</code>
+     *     {@code byte} fields such as {@code maxIntegerDigits} are ignored,
+     *     and the {@code int} fields such as {@code maximumIntegerDigits}
      *     are used instead.
      * </ul>
-     * When streaming out a <code>NumberFormat</code>, the most recent format
-     * (corresponding to the highest allowable <code>serialVersionOnStream</code>)
+     * When streaming out a {@code NumberFormat}, the most recent format
+     * (corresponding to the highest allowable {@code serialVersionOnStream})
      * is always written.
      *
      * @serial
@@ -1236,9 +1236,9 @@
     //
     /**
      * Defines constants that are used as attribute keys in the
-     * <code>AttributedCharacterIterator</code> returned
-     * from <code>NumberFormat.formatToCharacterIterator</code> and as
-     * field identifiers in <code>FieldPosition</code>.
+     * {@code AttributedCharacterIterator} returned
+     * from {@code NumberFormat.formatToCharacterIterator} and as
+     * field identifiers in {@code FieldPosition}.
      *
      * @since 1.4
      */
--- a/src/java.base/share/classes/java/text/ParsePosition.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/ParsePosition.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,14 +40,14 @@
 
 
 /**
- * <code>ParsePosition</code> is a simple class used by <code>Format</code>
+ * {@code ParsePosition} is a simple class used by {@code Format}
  * and its subclasses to keep track of the current position during parsing.
- * The <code>parseObject</code> method in the various <code>Format</code>
- * classes requires a <code>ParsePosition</code> object as an argument.
+ * The {@code parseObject} method in the various {@code Format}
+ * classes requires a {@code ParsePosition} object as an argument.
  *
  * <p>
  * By design, as you parse through a string with different formats,
- * you can use the same <code>ParsePosition</code>, since the index parameter
+ * you can use the same {@code ParsePosition}, since the index parameter
  * records the current position.
  *
  * @author      Mark Davis
--- a/src/java.base/share/classes/java/text/RuleBasedCollator.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/RuleBasedCollator.java	Tue Sep 24 09:43:43 2019 +0100
@@ -43,14 +43,14 @@
 import java.util.Locale;
 
 /**
- * The <code>RuleBasedCollator</code> class is a concrete subclass of
- * <code>Collator</code> that provides a simple, data-driven, table
+ * The {@code RuleBasedCollator} class is a concrete subclass of
+ * {@code Collator} that provides a simple, data-driven, table
  * collator.  With this class you can create a customized table-based
- * <code>Collator</code>.  <code>RuleBasedCollator</code> maps
+ * {@code Collator}.  {@code RuleBasedCollator} maps
  * characters to sort keys.
  *
  * <p>
- * <code>RuleBasedCollator</code> has the following restrictions
+ * {@code RuleBasedCollator} has the following restrictions
  * for efficiency (other subclasses may be used for more complex languages) :
  * <ol>
  * <li>If a special collation rule controlled by a &lt;modifier&gt; is
@@ -75,7 +75,7 @@
  *        [0021-002F, 003A-0040, 005B-0060, 007B-007E]). If those
  *        characters are desired, you can put them in single quotes
  *        (e.g. ampersand =&gt; '&amp;'). Note that unquoted white space characters
- *        are ignored; e.g. <code>b c</code> is treated as <code>bc</code>.
+ *        are ignored; e.g. {@code b c} is treated as {@code bc}.
  *    <LI><strong>Modifier</strong>: There are currently two modifiers that
  *        turn on special collation rules.
  *        <UL>
@@ -146,7 +146,7 @@
  *
  * <p><strong>Normalization and Accents</strong>
  * <p>
- * <code>RuleBasedCollator</code> automatically processes its rule table to
+ * {@code RuleBasedCollator} automatically processes its rule table to
  * include both pre-composed and combining-character versions of
  * accented characters.  Even if the provided rule string contains only
  * base characters and separate combining accent characters, the pre-composed
@@ -175,8 +175,8 @@
  *         text-argument) is not already in the sequence.
  *         (e.g. "a &lt; b &amp; e &lt; f")
  * </UL>
- * If you produce one of these errors, a <code>RuleBasedCollator</code> throws
- * a <code>ParseException</code>.
+ * If you produce one of these errors, a {@code RuleBasedCollator} throws
+ * a {@code ParseException}.
  *
  * <p><strong>Examples</strong>
  * <p>Simple:     "&lt; a &lt; b &lt; c &lt; d"
@@ -191,9 +191,9 @@
  *                      aa, AA"
  *
  * <p>
- * To create a <code>RuleBasedCollator</code> object with specialized
- * rules tailored to your needs, you construct the <code>RuleBasedCollator</code>
- * with the rules contained in a <code>String</code> object. For example:
+ * To create a {@code RuleBasedCollator} object with specialized
+ * rules tailored to your needs, you construct the {@code RuleBasedCollator}
+ * with the rules contained in a {@code String} object. For example:
  * <blockquote>
  * <pre>
  * String simple = "&lt; a&lt; b&lt; c&lt; d";
@@ -218,7 +218,7 @@
  * <p>
  * A new collation rules string can be created by concatenating rules
  * strings. For example, the rules returned by {@link #getRules()} could
- * be concatenated to combine multiple <code>RuleBasedCollator</code>s.
+ * be concatenated to combine multiple {@code RuleBasedCollator}s.
  *
  * <p>
  * The following example demonstrates how to change the order of
@@ -350,7 +350,7 @@
      * than, greater than or equal to another string in a language.
      * This can be overridden in a subclass.
      *
-     * @throws    NullPointerException if <code>source</code> or <code>target</code> is null.
+     * @throws    NullPointerException if {@code source} or {@code target} is null.
      */
     public synchronized int compare(String source, String target)
     {
--- a/src/java.base/share/classes/java/text/SimpleDateFormat.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/SimpleDateFormat.java	Tue Sep 24 09:43:43 2019 +0100
@@ -58,19 +58,19 @@
 import sun.util.locale.provider.TimeZoneNameUtility;
 
 /**
- * <code>SimpleDateFormat</code> is a concrete class for formatting and
+ * {@code SimpleDateFormat} is a concrete class for formatting and
  * parsing dates in a locale-sensitive manner. It allows for formatting
  * (date &rarr; text), parsing (text &rarr; date), and normalization.
  *
  * <p>
- * <code>SimpleDateFormat</code> allows you to start by choosing
+ * {@code SimpleDateFormat} allows you to start by choosing
  * any user-defined patterns for date-time formatting. However, you
  * are encouraged to create a date-time formatter with either
- * <code>getTimeInstance</code>, <code>getDateInstance</code>, or
- * <code>getDateTimeInstance</code> in <code>DateFormat</code>. Each
+ * {@code getTimeInstance}, {@code getDateInstance}, or
+ * {@code getDateTimeInstance} in {@code DateFormat}. Each
  * of these class methods can return a date/time formatter initialized
  * with a default format pattern. You may modify the format pattern
- * using the <code>applyPattern</code> methods as desired.
+ * using the {@code applyPattern} methods as desired.
  * For more information on using these methods, see
  * {@link DateFormat}.
  *
@@ -79,19 +79,19 @@
  * Date and time formats are specified by <em>date and time pattern</em>
  * strings.
  * Within date and time pattern strings, unquoted letters from
- * <code>'A'</code> to <code>'Z'</code> and from <code>'a'</code> to
- * <code>'z'</code> are interpreted as pattern letters representing the
+ * {@code 'A'} to {@code 'Z'} and from {@code 'a'} to
+ * {@code 'z'} are interpreted as pattern letters representing the
  * components of a date or time string.
- * Text can be quoted using single quotes (<code>'</code>) to avoid
+ * Text can be quoted using single quotes ({@code '}) to avoid
  * interpretation.
- * <code>"''"</code> represents a single quote.
+ * {@code "''"} represents a single quote.
  * All other characters are not interpreted; they're simply copied into the
  * output string during formatting or matched against the input string
  * during parsing.
  * <p>
  * The following pattern letters are defined (all other characters from
- * <code>'A'</code> to <code>'Z'</code> and from <code>'a'</code> to
- * <code>'z'</code> are reserved):
+ * {@code 'A'} to {@code 'Z'} and from {@code 'a'} to
+ * {@code 'z'} are reserved):
  * <blockquote>
  * <table class="striped">
  * <caption style="display:none">Chart shows pattern letters, date/time component, presentation, and examples.</caption>
@@ -104,120 +104,120 @@
  * </thead>
  * <tbody>
  *     <tr>
- *         <th scope="row"><code>G</code>
+ *         <th scope="row">{@code G}
  *         <td>Era designator
  *         <td><a href="#text">Text</a>
- *         <td><code>AD</code>
+ *         <td>{@code AD}
  *     <tr>
- *         <th scope="row"><code>y</code>
+ *         <th scope="row">{@code y}
  *         <td>Year
  *         <td><a href="#year">Year</a>
- *         <td><code>1996</code>; <code>96</code>
+ *         <td>{@code 1996}; {@code 96}
  *     <tr>
- *         <th scope="row"><code>Y</code>
+ *         <th scope="row">{@code Y}
  *         <td>Week year
  *         <td><a href="#year">Year</a>
- *         <td><code>2009</code>; <code>09</code>
+ *         <td>{@code 2009}; {@code 09}
  *     <tr>
- *         <th scope="row"><code>M</code>
+ *         <th scope="row">{@code M}
  *         <td>Month in year (context sensitive)
  *         <td><a href="#month">Month</a>
- *         <td><code>July</code>; <code>Jul</code>; <code>07</code>
+ *         <td>{@code July}; {@code Jul}; {@code 07}
  *     <tr>
- *         <th scope="row"><code>L</code>
+ *         <th scope="row">{@code L}
  *         <td>Month in year (standalone form)
  *         <td><a href="#month">Month</a>
- *         <td><code>July</code>; <code>Jul</code>; <code>07</code>
+ *         <td>{@code July}; {@code Jul}; {@code 07}
  *     <tr>
- *         <th scope="row"><code>w</code>
+ *         <th scope="row">{@code w}
  *         <td>Week in year
  *         <td><a href="#number">Number</a>
- *         <td><code>27</code>
+ *         <td>{@code 27}
  *     <tr>
- *         <th scope="row"><code>W</code>
+ *         <th scope="row">{@code W}
  *         <td>Week in month
  *         <td><a href="#number">Number</a>
- *         <td><code>2</code>
+ *         <td>{@code 2}
  *     <tr>
- *         <th scope="row"><code>D</code>
+ *         <th scope="row">{@code D}
  *         <td>Day in year
  *         <td><a href="#number">Number</a>
- *         <td><code>189</code>
+ *         <td>{@code 189}
  *     <tr>
- *         <th scope="row"><code>d</code>
+ *         <th scope="row">{@code d}
  *         <td>Day in month
  *         <td><a href="#number">Number</a>
- *         <td><code>10</code>
+ *         <td>{@code 10}
  *     <tr>
- *         <th scope="row"><code>F</code>
+ *         <th scope="row">{@code F}
  *         <td>Day of week in month
  *         <td><a href="#number">Number</a>
- *         <td><code>2</code>
+ *         <td>{@code 2}
  *     <tr>
- *         <th scope="row"><code>E</code>
+ *         <th scope="row">{@code E}
  *         <td>Day name in week
  *         <td><a href="#text">Text</a>
- *         <td><code>Tuesday</code>; <code>Tue</code>
+ *         <td>{@code Tuesday}; {@code Tue}
  *     <tr>
- *         <th scope="row"><code>u</code>
+ *         <th scope="row">{@code u}
  *         <td>Day number of week (1 = Monday, ..., 7 = Sunday)
  *         <td><a href="#number">Number</a>
- *         <td><code>1</code>
+ *         <td>{@code 1}
  *     <tr>
- *         <th scope="row"><code>a</code>
+ *         <th scope="row">{@code a}
  *         <td>Am/pm marker
  *         <td><a href="#text">Text</a>
- *         <td><code>PM</code>
+ *         <td>{@code PM}
  *     <tr>
- *         <th scope="row"><code>H</code>
+ *         <th scope="row">{@code H}
  *         <td>Hour in day (0-23)
  *         <td><a href="#number">Number</a>
- *         <td><code>0</code>
+ *         <td>{@code 0}
  *     <tr>
- *         <th scope="row"><code>k</code>
+ *         <th scope="row">{@code k}
  *         <td>Hour in day (1-24)
  *         <td><a href="#number">Number</a>
- *         <td><code>24</code>
+ *         <td>{@code 24}
  *     <tr>
- *         <th scope="row"><code>K</code>
+ *         <th scope="row">{@code K}
  *         <td>Hour in am/pm (0-11)
  *         <td><a href="#number">Number</a>
- *         <td><code>0</code>
+ *         <td>{@code 0}
  *     <tr>
- *         <th scope="row"><code>h</code>
+ *         <th scope="row">{@code h}
  *         <td>Hour in am/pm (1-12)
  *         <td><a href="#number">Number</a>
- *         <td><code>12</code>
+ *         <td>{@code 12}
  *     <tr>
- *         <th scope="row"><code>m</code>
+ *         <th scope="row">{@code m}
  *         <td>Minute in hour
  *         <td><a href="#number">Number</a>
- *         <td><code>30</code>
+ *         <td>{@code 30}
  *     <tr>
- *         <th scope="row"><code>s</code>
+ *         <th scope="row">{@code s}
  *         <td>Second in minute
  *         <td><a href="#number">Number</a>
- *         <td><code>55</code>
+ *         <td>{@code 55}
  *     <tr>
- *         <th scope="row"><code>S</code>
+ *         <th scope="row">{@code S}
  *         <td>Millisecond
  *         <td><a href="#number">Number</a>
- *         <td><code>978</code>
+ *         <td>{@code 978}
  *     <tr>
- *         <th scope="row"><code>z</code>
+ *         <th scope="row">{@code z}
  *         <td>Time zone
  *         <td><a href="#timezone">General time zone</a>
- *         <td><code>Pacific Standard Time</code>; <code>PST</code>; <code>GMT-08:00</code>
+ *         <td>{@code Pacific Standard Time}; {@code PST}; {@code GMT-08:00}
  *     <tr>
- *         <th scope="row"><code>Z</code>
+ *         <th scope="row">{@code Z}
  *         <td>Time zone
  *         <td><a href="#rfc822timezone">RFC 822 time zone</a>
- *         <td><code>-0800</code>
+ *         <td>{@code -0800}
  *     <tr>
- *         <th scope="row"><code>X</code>
+ *         <th scope="row">{@code X}
  *         <td>Time zone
  *         <td><a href="#iso8601timezone">ISO 8601 time zone</a>
- *         <td><code>-08</code>; <code>-0800</code>;  <code>-08:00</code>
+ *         <td>{@code -08}; {@code -0800};  {@code -08:00}
  * </tbody>
  * </table>
  * </blockquote>
@@ -247,11 +247,11 @@
  *         digits. So using the pattern "MM/dd/yyyy", "01/11/12" parses to
  *         Jan 11, 12 A.D.
  *     <li>For parsing with the abbreviated year pattern ("y" or "yy"),
- *         <code>SimpleDateFormat</code> must interpret the abbreviated year
+ *         {@code SimpleDateFormat} must interpret the abbreviated year
  *         relative to some century.  It does this by adjusting dates to be
- *         within 80 years before and 20 years after the time the <code>SimpleDateFormat</code>
+ *         within 80 years before and 20 years after the time the {@code SimpleDateFormat}
  *         instance is created. For example, using a pattern of "MM/dd/yy" and a
- *         <code>SimpleDateFormat</code> instance created on Jan 1, 1997,  the string
+ *         {@code SimpleDateFormat} instance created on Jan 1, 1997,  the string
  *         "01/11/12" would be interpreted as Jan 11, 2012 while the string "05/04/64"
  *         would be interpreted as May 4, 1964.
  *         During parsing, only strings consisting of exactly two digits, as defined by
@@ -303,16 +303,16 @@
  *     following syntax is used:
  *     <pre>
  *     <a id="GMTOffsetTimeZone"><i>GMTOffsetTimeZone:</i></a>
- *             <code>GMT</code> <i>Sign</i> <i>Hours</i> <code>:</code> <i>Minutes</i>
+ *             {@code GMT} <i>Sign</i> <i>Hours</i> {@code :} <i>Minutes</i>
  *     <i>Sign:</i> one of
- *             <code>+ -</code>
+ *             {@code + -}
  *     <i>Hours:</i>
  *             <i>Digit</i>
  *             <i>Digit</i> <i>Digit</i>
  *     <i>Minutes:</i>
  *             <i>Digit</i> <i>Digit</i>
  *     <i>Digit:</i> one of
- *             <code>0 1 2 3 4 5 6 7 8 9</code></pre>
+ *             {@code 0 1 2 3 4 5 6 7 8 9}</pre>
  *     <i>Hours</i> must be between 0 and 23, and <i>Minutes</i> must be between
  *     00 and 59. The format is locale independent and digits must be taken
  *     from the Basic Latin block of the Unicode standard.
@@ -364,10 +364,10 @@
  *     SimpleDateFormat} or {@linkplain #applyPattern(String) applying a
  *     pattern}.
  * </ul>
- * <code>SimpleDateFormat</code> also supports <em>localized date and time
+ * {@code SimpleDateFormat} also supports <em>localized date and time
  * pattern</em> strings. In these strings, the pattern letters described above
  * may be replaced with other, locale dependent, pattern letters.
- * <code>SimpleDateFormat</code> does not deal with the localization of text
+ * {@code SimpleDateFormat} does not deal with the localization of text
  * other than the pattern letters; that's up to the client of the class.
  *
  * <h3>Examples</h3>
@@ -385,38 +385,38 @@
  * </thead>
  * <tbody>
  *     <tr>
- *         <th scope="row"><code>"yyyy.MM.dd G 'at' HH:mm:ss z"</code>
- *         <td><code>2001.07.04 AD at 12:08:56 PDT</code>
+ *         <th scope="row">{@code "yyyy.MM.dd G 'at' HH:mm:ss z"}
+ *         <td>{@code 2001.07.04 AD at 12:08:56 PDT}
  *     <tr>
- *         <th scope="row"><code>"EEE, MMM d, ''yy"</code>
- *         <td><code>Wed, Jul 4, '01</code>
+ *         <th scope="row">{@code "EEE, MMM d, ''yy"}
+ *         <td>{@code Wed, Jul 4, '01}
  *     <tr>
- *         <th scope="row"><code>"h:mm a"</code>
- *         <td><code>12:08 PM</code>
+ *         <th scope="row">{@code "h:mm a"}
+ *         <td>{@code 12:08 PM}
  *     <tr>
- *         <th scope="row"><code>"hh 'o''clock' a, zzzz"</code>
- *         <td><code>12 o'clock PM, Pacific Daylight Time</code>
+ *         <th scope="row">{@code "hh 'o''clock' a, zzzz"}
+ *         <td>{@code 12 o'clock PM, Pacific Daylight Time}
  *     <tr>
- *         <th scope="row"><code>"K:mm a, z"</code>
- *         <td><code>0:08 PM, PDT</code>
+ *         <th scope="row">{@code "K:mm a, z"}
+ *         <td>{@code 0:08 PM, PDT}
  *     <tr>
- *         <th scope="row"><code>"yyyyy.MMMMM.dd GGG hh:mm aaa"</code>
- *         <td><code>02001.July.04 AD 12:08 PM</code>
+ *         <th scope="row">{@code "yyyyy.MMMMM.dd GGG hh:mm aaa"}
+ *         <td>{@code 02001.July.04 AD 12:08 PM}
  *     <tr>
- *         <th scope="row"><code>"EEE, d MMM yyyy HH:mm:ss Z"</code>
- *         <td><code>Wed, 4 Jul 2001 12:08:56 -0700</code>
+ *         <th scope="row">{@code "EEE, d MMM yyyy HH:mm:ss Z"}
+ *         <td>{@code Wed, 4 Jul 2001 12:08:56 -0700}
  *     <tr>
- *         <th scope="row"><code>"yyMMddHHmmssZ"</code>
- *         <td><code>010704120856-0700</code>
+ *         <th scope="row">{@code "yyMMddHHmmssZ"}
+ *         <td>{@code 010704120856-0700}
  *     <tr>
- *         <th scope="row"><code>"yyyy-MM-dd'T'HH:mm:ss.SSSZ"</code>
- *         <td><code>2001-07-04T12:08:56.235-0700</code>
+ *         <th scope="row">{@code "yyyy-MM-dd'T'HH:mm:ss.SSSZ"}
+ *         <td>{@code 2001-07-04T12:08:56.235-0700}
  *     <tr>
- *         <th scope="row"><code>"yyyy-MM-dd'T'HH:mm:ss.SSSXXX"</code>
- *         <td><code>2001-07-04T12:08:56.235-07:00</code>
+ *         <th scope="row">{@code "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"}
+ *         <td>{@code 2001-07-04T12:08:56.235-07:00}
  *     <tr>
- *         <th scope="row"><code>"YYYY-'W'ww-u"</code>
- *         <td><code>2001-W27-3</code>
+ *         <th scope="row">{@code "YYYY-'W'ww-u"}
+ *         <td>{@code 2001-W27-3}
  * </tbody>
  * </table>
  * </blockquote>
@@ -453,12 +453,12 @@
      * The version of the serialized data on the stream.  Possible values:
      * <ul>
      * <li><b>0</b> or not present on stream: JDK 1.1.3.  This version
-     * has no <code>defaultCenturyStart</code> on stream.
+     * has no {@code defaultCenturyStart} on stream.
      * <li><b>1</b> JDK 1.1.4 or later.  This version adds
-     * <code>defaultCenturyStart</code>.
+     * {@code defaultCenturyStart}.
      * </ul>
      * When streaming out this class, the most recent format
-     * and the highest allowable <code>serialVersionOnStream</code>
+     * and the highest allowable {@code serialVersionOnStream}
      * is written.
      * @serial
      * @since 1.1.4
@@ -523,7 +523,7 @@
 
     /**
      * We map dates with two-digit years into the century starting at
-     * <code>defaultCenturyStart</code>, which may be any date.  May
+     * {@code defaultCenturyStart}, which may be any date.  May
      * not be null.
      * @serial
      * @since 1.1.4
@@ -546,8 +546,8 @@
 
     /**
      * The Locale used to instantiate this
-     * <code>SimpleDateFormat</code>. The value may be null if this object
-     * has been created by an older <code>SimpleDateFormat</code> and
+     * {@code SimpleDateFormat}. The value may be null if this object
+     * has been created by an older {@code SimpleDateFormat} and
      * deserialized.
      *
      * @serial
@@ -556,7 +556,7 @@
     private Locale locale;
 
     /**
-     * Indicates whether this <code>SimpleDateFormat</code> should use
+     * Indicates whether this {@code SimpleDateFormat} should use
      * the DateFormatSymbols. If true, the format and parse methods
      * use the DateFormatSymbols values. If false, the format and
      * parse methods call Calendar.getDisplayName or
@@ -565,7 +565,7 @@
     transient boolean useDateFormatSymbols;
 
     /**
-     * Constructs a <code>SimpleDateFormat</code> using the default pattern and
+     * Constructs a {@code SimpleDateFormat} using the default pattern and
      * date format symbols for the default
      * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
      * <b>Note:</b> This constructor may not support all locales.
@@ -579,7 +579,7 @@
     }
 
     /**
-     * Constructs a <code>SimpleDateFormat</code> using the given pattern and
+     * Constructs a {@code SimpleDateFormat} using the given pattern and
      * the default date format symbols for the default
      * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
      * <b>Note:</b> This constructor may not support all locales.
@@ -601,7 +601,7 @@
     }
 
     /**
-     * Constructs a <code>SimpleDateFormat</code> using the given pattern and
+     * Constructs a {@code SimpleDateFormat} using the given pattern and
      * the default date format symbols for the given locale.
      * <b>Note:</b> This constructor may not support all locales.
      * For full coverage, use the factory methods in the {@link DateFormat}
@@ -626,7 +626,7 @@
     }
 
     /**
-     * Constructs a <code>SimpleDateFormat</code> using the given pattern and
+     * Constructs a {@code SimpleDateFormat} using the given pattern and
      * date format symbols.
      *
      * @param pattern the pattern describing the date and time format
@@ -916,7 +916,7 @@
      * to begin on the date the user specifies.
      *
      * @param startDate During parsing, two digit years will be placed in the range
-     * <code>startDate</code> to <code>startDate + 100 years</code>.
+     * {@code startDate} to {@code startDate + 100 years}.
      * @see #get2DigitYearStart
      * @throws NullPointerException if {@code startDate} is {@code null}.
      * @since 1.2
@@ -939,8 +939,8 @@
     }
 
     /**
-     * Formats the given <code>Date</code> into a date/time string and appends
-     * the result to the given <code>StringBuffer</code>.
+     * Formats the given {@code Date} into a date/time string and appends
+     * the result to the given {@code StringBuffer}.
      *
      * @param date the date-time value to be formatted into a date-time string.
      * @param toAppendTo where the new date-time text is to be appended.
@@ -1003,13 +1003,13 @@
     }
 
     /**
-     * Formats an Object producing an <code>AttributedCharacterIterator</code>.
-     * You can use the returned <code>AttributedCharacterIterator</code>
+     * Formats an Object producing an {@code AttributedCharacterIterator}.
+     * You can use the returned {@code AttributedCharacterIterator}
      * to build the resulting String, as well as to determine information
      * about the resulting String.
      * <p>
      * Each attribute key of the AttributedCharacterIterator will be of type
-     * <code>DateFormat.Field</code>, with the corresponding attribute value
+     * {@code DateFormat.Field}, with the corresponding attribute value
      * being the same as the attribute key.
      *
      * @throws    NullPointerException if obj is null.
@@ -1427,17 +1427,17 @@
 
 
     /**
-     * Parses text from a string to produce a <code>Date</code>.
+     * Parses text from a string to produce a {@code Date}.
      * <p>
      * The method attempts to parse text starting at the index given by
-     * <code>pos</code>.
-     * If parsing succeeds, then the index of <code>pos</code> is updated
+     * {@code pos}.
+     * If parsing succeeds, then the index of {@code pos} is updated
      * to the index after the last character used (parsing does not necessarily
      * use all characters up to the end of the string), and the parsed
-     * date is returned. The updated <code>pos</code> can be used to
+     * date is returned. The updated {@code pos} can be used to
      * indicate the starting point for the next call to this method.
-     * If an error occurs, then the index of <code>pos</code> is not
-     * changed, the error index of <code>pos</code> is set to the index of
+     * If an error occurs, then the index of {@code pos} is not
+     * changed, the error index of {@code pos} is set to the index of
      * the character where the error occurred, and null is returned.
      *
      * <p>This parsing operation uses the {@link DateFormat#calendar
@@ -1454,12 +1454,12 @@
      * {@link #setTimeZone(java.util.TimeZone) setTimeZone} may need
      * to be restored for further operations.
      *
-     * @param text  A <code>String</code>, part of which should be parsed.
-     * @param pos   A <code>ParsePosition</code> object with index and error
+     * @param text  A {@code String}, part of which should be parsed.
+     * @param pos   A {@code ParsePosition} object with index and error
      *              index information as described above.
-     * @return A <code>Date</code> parsed from the string. In case of
+     * @return A {@code Date} parsed from the string. In case of
      *         error, returns null.
-     * @throws    NullPointerException if <code>text</code> or <code>pos</code> is null.
+     * @throws    NullPointerException if {@code text} or {@code pos} is null.
      */
     @Override
     public Date parse(String text, ParsePosition pos)
@@ -2393,10 +2393,10 @@
     }
 
     /**
-     * Creates a copy of this <code>SimpleDateFormat</code>. This also
+     * Creates a copy of this {@code SimpleDateFormat}. This also
      * clones the format's date format symbols.
      *
-     * @return a clone of this <code>SimpleDateFormat</code>
+     * @return a clone of this {@code SimpleDateFormat}
      */
     @Override
     public Object clone() {
@@ -2406,9 +2406,9 @@
     }
 
     /**
-     * Returns the hash code value for this <code>SimpleDateFormat</code> object.
+     * Returns the hash code value for this {@code SimpleDateFormat} object.
      *
-     * @return the hash code value for this <code>SimpleDateFormat</code> object.
+     * @return the hash code value for this {@code SimpleDateFormat} object.
      */
     @Override
     public int hashCode()
@@ -2418,11 +2418,11 @@
     }
 
     /**
-     * Compares the given object with this <code>SimpleDateFormat</code> for
+     * Compares the given object with this {@code SimpleDateFormat} for
      * equality.
      *
      * @return true if the given object is equal to this
-     * <code>SimpleDateFormat</code>
+     * {@code SimpleDateFormat}
      */
     @Override
     public boolean equals(Object obj)
--- a/src/java.base/share/classes/java/text/StringCharacterIterator.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/StringCharacterIterator.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,10 +41,10 @@
 package java.text;
 
 /**
- * <code>StringCharacterIterator</code> implements the
- * <code>CharacterIterator</code> protocol for a <code>String</code>.
- * The <code>StringCharacterIterator</code> class iterates over the
- * entire <code>String</code>.
+ * {@code StringCharacterIterator} implements the
+ * {@code CharacterIterator} protocol for a {@code String}.
+ * The {@code StringCharacterIterator} class iterates over the
+ * entire {@code String}.
  *
  * @see CharacterIterator
  * @since 1.1
--- a/src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java	Tue Sep 24 09:43:43 2019 +0100
@@ -46,13 +46,13 @@
     }
 
     /**
-     * Returns a new <code>BreakIterator</code> instance
+     * Returns a new {@code BreakIterator} instance
      * for <a href="../BreakIterator.html#word">word breaks</a>
      * for the given locale.
      * @param locale the desired locale
      * @return A break iterator for word breaks
-     * @throws    NullPointerException if <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>locale</code> isn't
+     * @throws    NullPointerException if {@code locale} is null
+     * @throws    IllegalArgumentException if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
@@ -61,13 +61,13 @@
     public abstract BreakIterator getWordInstance(Locale locale);
 
     /**
-     * Returns a new <code>BreakIterator</code> instance
+     * Returns a new {@code BreakIterator} instance
      * for <a href="../BreakIterator.html#line">line breaks</a>
      * for the given locale.
      * @param locale the desired locale
      * @return A break iterator for line breaks
-     * @throws    NullPointerException if <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>locale</code> isn't
+     * @throws    NullPointerException if {@code locale} is null
+     * @throws    IllegalArgumentException if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
@@ -76,13 +76,13 @@
     public abstract BreakIterator getLineInstance(Locale locale);
 
     /**
-     * Returns a new <code>BreakIterator</code> instance
+     * Returns a new {@code BreakIterator} instance
      * for <a href="../BreakIterator.html#character">character breaks</a>
      * for the given locale.
      * @param locale the desired locale
      * @return A break iterator for character breaks
-     * @throws    NullPointerException if <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>locale</code> isn't
+     * @throws    NullPointerException if {@code locale} is null
+     * @throws    IllegalArgumentException if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
@@ -91,13 +91,13 @@
     public abstract BreakIterator getCharacterInstance(Locale locale);
 
     /**
-     * Returns a new <code>BreakIterator</code> instance
+     * Returns a new {@code BreakIterator} instance
      * for <a href="../BreakIterator.html#sentence">sentence breaks</a>
      * for the given locale.
      * @param locale the desired locale
      * @return A break iterator for sentence breaks
-     * @throws    NullPointerException if <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>locale</code> isn't
+     * @throws    NullPointerException if {@code locale} is null
+     * @throws    IllegalArgumentException if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
--- a/src/java.base/share/classes/java/text/spi/CollatorProvider.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/spi/CollatorProvider.java	Tue Sep 24 09:43:43 2019 +0100
@@ -46,12 +46,12 @@
     }
 
     /**
-     * Returns a new <code>Collator</code> instance for the specified locale.
+     * Returns a new {@code Collator} instance for the specified locale.
      * @param locale the desired locale.
-     * @return the <code>Collator</code> for the desired locale.
+     * @return the {@code Collator} for the desired locale.
      * @throws    NullPointerException if
-     * <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>locale</code> isn't
+     * {@code locale} is null
+     * @throws    IllegalArgumentException if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
--- a/src/java.base/share/classes/java/text/spi/DateFormatProvider.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/spi/DateFormatProvider.java	Tue Sep 24 09:43:43 2019 +0100
@@ -46,7 +46,7 @@
     }
 
     /**
-     * Returns a new <code>DateFormat</code> instance which formats time
+     * Returns a new {@code DateFormat} instance which formats time
      * with the given formatting style for the specified locale.
      * @param style the given formatting style.  Either one of
      *     {@link java.text.DateFormat#SHORT DateFormat.SHORT},
@@ -54,19 +54,19 @@
      *     {@link java.text.DateFormat#LONG DateFormat.LONG}, or
      *     {@link java.text.DateFormat#FULL DateFormat.FULL}.
      * @param locale the desired locale.
-     * @throws    IllegalArgumentException if <code>style</code> is invalid,
-     *     or if <code>locale</code> isn't
+     * @throws    IllegalArgumentException if {@code style} is invalid,
+     *     or if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
-     * @throws    NullPointerException if <code>locale</code> is null
+     * @throws    NullPointerException if {@code locale} is null
      * @return a time formatter.
      * @see java.text.DateFormat#getTimeInstance(int, java.util.Locale)
      */
     public abstract DateFormat getTimeInstance(int style, Locale locale);
 
     /**
-     * Returns a new <code>DateFormat</code> instance which formats date
+     * Returns a new {@code DateFormat} instance which formats date
      * with the given formatting style for the specified locale.
      * @param style the given formatting style.  Either one of
      *     {@link java.text.DateFormat#SHORT DateFormat.SHORT},
@@ -74,19 +74,19 @@
      *     {@link java.text.DateFormat#LONG DateFormat.LONG}, or
      *     {@link java.text.DateFormat#FULL DateFormat.FULL}.
      * @param locale the desired locale.
-     * @throws    IllegalArgumentException if <code>style</code> is invalid,
-     *     or if <code>locale</code> isn't
+     * @throws    IllegalArgumentException if {@code style} is invalid,
+     *     or if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
-     * @throws    NullPointerException if <code>locale</code> is null
+     * @throws    NullPointerException if {@code locale} is null
      * @return a date formatter.
      * @see java.text.DateFormat#getDateInstance(int, java.util.Locale)
      */
     public abstract DateFormat getDateInstance(int style, Locale locale);
 
     /**
-     * Returns a new <code>DateFormat</code> instance which formats date and time
+     * Returns a new {@code DateFormat} instance which formats date and time
      * with the given formatting style for the specified locale.
      * @param dateStyle the given date formatting style.  Either one of
      *     {@link java.text.DateFormat#SHORT DateFormat.SHORT},
@@ -99,13 +99,13 @@
      *     {@link java.text.DateFormat#LONG DateFormat.LONG}, or
      *     {@link java.text.DateFormat#FULL DateFormat.FULL}.
      * @param locale the desired locale.
-     * @throws    IllegalArgumentException if <code>dateStyle</code> or
-     *     <code>timeStyle</code> is invalid,
-     *     or if <code>locale</code> isn't
+     * @throws    IllegalArgumentException if {@code dateStyle} or
+     *     {@code timeStyle} is invalid,
+     *     or if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
-     * @throws    NullPointerException if <code>locale</code> is null
+     * @throws    NullPointerException if {@code locale} is null
      * @return a date/time formatter.
      * @see java.text.DateFormat#getDateTimeInstance(int, int, java.util.Locale)
      */
--- a/src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java	Tue Sep 24 09:43:43 2019 +0100
@@ -46,16 +46,16 @@
     }
 
     /**
-     * Returns a new <code>DateFormatSymbols</code> instance for the
+     * Returns a new {@code DateFormatSymbols} instance for the
      * specified locale.
      *
      * @param locale the desired locale
-     * @throws    NullPointerException if <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>locale</code> isn't
+     * @throws    NullPointerException if {@code locale} is null
+     * @throws    IllegalArgumentException if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
-     * @return a <code>DateFormatSymbols</code> instance.
+     * @return a {@code DateFormatSymbols} instance.
      * @see java.text.DateFormatSymbols#getInstance(java.util.Locale)
      */
     public abstract DateFormatSymbols getInstance(Locale locale);
--- a/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java	Tue Sep 24 09:43:43 2019 +0100
@@ -56,16 +56,16 @@
     }
 
     /**
-     * Returns a new <code>DecimalFormatSymbols</code> instance for the
+     * Returns a new {@code DecimalFormatSymbols} instance for the
      * specified locale.
      *
      * @param locale the desired locale
-     * @throws    NullPointerException if <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>locale</code> isn't
+     * @throws    NullPointerException if {@code locale} is null
+     * @throws    IllegalArgumentException if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
-     * @return a <code>DecimalFormatSymbols</code> instance.
+     * @return a {@code DecimalFormatSymbols} instance.
      * @see java.text.DecimalFormatSymbols#getInstance(java.util.Locale)
      */
     public abstract DecimalFormatSymbols getInstance(Locale locale);
--- a/src/java.base/share/classes/java/text/spi/NumberFormatProvider.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/text/spi/NumberFormatProvider.java	Tue Sep 24 09:43:43 2019 +0100
@@ -46,12 +46,12 @@
     }
 
     /**
-     * Returns a new <code>NumberFormat</code> instance which formats
+     * Returns a new {@code NumberFormat} instance which formats
      * monetary values for the specified locale.
      *
      * @param locale the desired locale.
-     * @throws    NullPointerException if <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>locale</code> isn't
+     * @throws    NullPointerException if {@code locale} is null
+     * @throws    IllegalArgumentException if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
@@ -61,7 +61,7 @@
     public abstract NumberFormat getCurrencyInstance(Locale locale);
 
     /**
-     * Returns a new <code>NumberFormat</code> instance which formats
+     * Returns a new {@code NumberFormat} instance which formats
      * integer values for the specified locale.
      * The returned number format is configured to
      * round floating point numbers to the nearest integer using
@@ -71,8 +71,8 @@
      * java.text.NumberFormat#isParseIntegerOnly isParseIntegerOnly}).
      *
      * @param locale the desired locale
-     * @throws    NullPointerException if <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>locale</code> isn't
+     * @throws    NullPointerException if {@code locale} is null
+     * @throws    IllegalArgumentException if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
@@ -82,12 +82,12 @@
     public abstract NumberFormat getIntegerInstance(Locale locale);
 
     /**
-     * Returns a new general-purpose <code>NumberFormat</code> instance for
+     * Returns a new general-purpose {@code NumberFormat} instance for
      * the specified locale.
      *
      * @param locale the desired locale
-     * @throws    NullPointerException if <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>locale</code> isn't
+     * @throws    NullPointerException if {@code locale} is null
+     * @throws    IllegalArgumentException if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
@@ -97,12 +97,12 @@
     public abstract NumberFormat getNumberInstance(Locale locale);
 
     /**
-     * Returns a new <code>NumberFormat</code> instance which formats
+     * Returns a new {@code NumberFormat} instance which formats
      * percentage values for the specified locale.
      *
      * @param locale the desired locale
-     * @throws    NullPointerException if <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>locale</code> isn't
+     * @throws    NullPointerException if {@code locale} is null
+     * @throws    IllegalArgumentException if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
--- a/src/java.base/share/classes/java/time/ZoneId.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/time/ZoneId.java	Tue Sep 24 09:43:43 2019 +0100
@@ -339,7 +339,7 @@
      *  The rules of the returned {@code ZoneId} will be equivalent to the
      *  parsed {@code ZoneOffset}.
      * <li>All other IDs are parsed as region-based zone IDs. Region IDs must
-     *  match the regular expression <code>[A-Za-z][A-Za-z0-9~/._+-]+</code>
+     *  match the regular expression {@code [A-Za-z][A-Za-z0-9~/._+-]+}
      *  otherwise a {@code DateTimeException} is thrown. If the zone ID is not
      *  in the configured set of IDs, {@code ZoneRulesException} is thrown.
      *  The detailed format of the region ID depends on the group supplying the data.
--- a/src/java.base/share/classes/java/util/Calendar.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/Calendar.java	Tue Sep 24 09:43:43 2019 +0100
@@ -62,10 +62,10 @@
 import sun.util.spi.CalendarProvider;
 
 /**
- * The <code>Calendar</code> class is an abstract class that provides methods
+ * The {@code Calendar} class is an abstract class that provides methods
  * for converting between a specific instant in time and a set of {@link
- * #fields calendar fields} such as <code>YEAR</code>, <code>MONTH</code>,
- * <code>DAY_OF_MONTH</code>, <code>HOUR</code>, and so on, and for
+ * #fields calendar fields} such as {@code YEAR}, {@code MONTH},
+ * {@code DAY_OF_MONTH}, {@code HOUR}, and so on, and for
  * manipulating the calendar fields, such as getting the date of the next
  * week. An instant in time can be represented by a millisecond value that is
  * an offset from the <a id="Epoch"><em>Epoch</em></a>, January 1, 1970
@@ -73,13 +73,13 @@
  *
  * <p>The class also provides additional fields and methods for
  * implementing a concrete calendar system outside the package. Those
- * fields and methods are defined as <code>protected</code>.
+ * fields and methods are defined as {@code protected}.
  *
  * <p>
- * Like other locale-sensitive classes, <code>Calendar</code> provides a
- * class method, <code>getInstance</code>, for getting a generally useful
- * object of this type. <code>Calendar</code>'s <code>getInstance</code> method
- * returns a <code>Calendar</code> object whose
+ * Like other locale-sensitive classes, {@code Calendar} provides a
+ * class method, {@code getInstance}, for getting a generally useful
+ * object of this type. {@code Calendar}'s {@code getInstance} method
+ * returns a {@code Calendar} object whose
  * calendar fields have been initialized with the current date and time:
  * <blockquote>
  * <pre>
@@ -87,47 +87,47 @@
  * </pre>
  * </blockquote>
  *
- * <p>A <code>Calendar</code> object can produce all the calendar field values
+ * <p>A {@code Calendar} object can produce all the calendar field values
  * needed to implement the date-time formatting for a particular language and
  * calendar style (for example, Japanese-Gregorian, Japanese-Traditional).
- * <code>Calendar</code> defines the range of values returned by
+ * {@code Calendar} defines the range of values returned by
  * certain calendar fields, as well as their meaning.  For example,
  * the first month of the calendar system has value <code>MONTH ==
  * JANUARY</code> for all calendars.  Other values are defined by the
- * concrete subclass, such as <code>ERA</code>.  See individual field
+ * concrete subclass, such as {@code ERA}.  See individual field
  * documentation and subclass documentation for details.
  *
  * <h2>Getting and Setting Calendar Field Values</h2>
  *
- * <p>The calendar field values can be set by calling the <code>set</code>
- * methods. Any field values set in a <code>Calendar</code> will not be
+ * <p>The calendar field values can be set by calling the {@code set}
+ * methods. Any field values set in a {@code Calendar} will not be
  * interpreted until it needs to calculate its time value (milliseconds from
  * the Epoch) or values of the calendar fields. Calling the
- * <code>get</code>, <code>getTimeInMillis</code>, <code>getTime</code>,
- * <code>add</code> and <code>roll</code> involves such calculation.
+ * {@code get}, {@code getTimeInMillis}, {@code getTime},
+ * {@code add} and {@code roll} involves such calculation.
  *
  * <h3>Leniency</h3>
  *
- * <p><code>Calendar</code> has two modes for interpreting the calendar
+ * <p>{@code Calendar} has two modes for interpreting the calendar
  * fields, <em>lenient</em> and <em>non-lenient</em>.  When a
- * <code>Calendar</code> is in lenient mode, it accepts a wider range of
- * calendar field values than it produces.  When a <code>Calendar</code>
- * recomputes calendar field values for return by <code>get()</code>, all of
+ * {@code Calendar} is in lenient mode, it accepts a wider range of
+ * calendar field values than it produces.  When a {@code Calendar}
+ * recomputes calendar field values for return by {@code get()}, all of
  * the calendar fields are normalized. For example, a lenient
- * <code>GregorianCalendar</code> interprets <code>MONTH == JANUARY</code>,
- * <code>DAY_OF_MONTH == 32</code> as February 1.
+ * {@code GregorianCalendar} interprets {@code MONTH == JANUARY},
+ * {@code DAY_OF_MONTH == 32} as February 1.
 
- * <p>When a <code>Calendar</code> is in non-lenient mode, it throws an
+ * <p>When a {@code Calendar} is in non-lenient mode, it throws an
  * exception if there is any inconsistency in its calendar fields. For
- * example, a <code>GregorianCalendar</code> always produces
- * <code>DAY_OF_MONTH</code> values between 1 and the length of the month. A
- * non-lenient <code>GregorianCalendar</code> throws an exception upon
+ * example, a {@code GregorianCalendar} always produces
+ * {@code DAY_OF_MONTH} values between 1 and the length of the month. A
+ * non-lenient {@code GregorianCalendar} throws an exception upon
  * calculating its time or calendar field values if any out-of-range field
  * value has been set.
  *
  * <h3><a id="first_week">First Week</a></h3>
  *
- * <code>Calendar</code> defines a locale-specific seven day week using two
+ * {@code Calendar} defines a locale-specific seven day week using two
  * parameters: the first day of the week and the minimal days in first week
  * (from 1 to 7).  These numbers are taken from the locale resource data or the
  * locale itself when a {@code Calendar} is constructed. If the designated
@@ -138,15 +138,15 @@
  * They may also be specified explicitly through the methods for setting their
  * values.
  *
- * <p>When setting or getting the <code>WEEK_OF_MONTH</code> or
- * <code>WEEK_OF_YEAR</code> fields, <code>Calendar</code> must determine the
+ * <p>When setting or getting the {@code WEEK_OF_MONTH} or
+ * {@code WEEK_OF_YEAR} fields, {@code Calendar} must determine the
  * first week of the month or year as a reference point.  The first week of a
  * month or year is defined as the earliest seven day period beginning on
- * <code>getFirstDayOfWeek()</code> and containing at least
- * <code>getMinimalDaysInFirstWeek()</code> days of that month or year.  Weeks
+ * {@code getFirstDayOfWeek()} and containing at least
+ * {@code getMinimalDaysInFirstWeek()} days of that month or year.  Weeks
  * numbered ..., -1, 0 precede the first week; weeks numbered 2, 3,... follow
- * it.  Note that the normalized numbering returned by <code>get()</code> may be
- * different.  For example, a specific <code>Calendar</code> subclass may
+ * it.  Note that the normalized numbering returned by {@code get()} may be
+ * different.  For example, a specific {@code Calendar} subclass may
  * designate the week before week 1 of a year as week <code><i>n</i></code> of
  * the previous year.
  *
@@ -156,12 +156,12 @@
  * may be insufficient information for the computation (such as only
  * year and month with no day of month), or there may be inconsistent
  * information (such as Tuesday, July 15, 1996 (Gregorian) -- July 15,
- * 1996 is actually a Monday). <code>Calendar</code> will resolve
+ * 1996 is actually a Monday). {@code Calendar} will resolve
  * calendar field values to determine the date and time in the
  * following way.
  *
  * <p><a id="resolution">If there is any conflict in calendar field values,
- * <code>Calendar</code> gives priorities to calendar fields that have been set
+ * {@code Calendar} gives priorities to calendar fields that have been set
  * more recently.</a> The following are the default combinations of the
  * calendar fields. The most recent combination, as determined by the
  * most recently set single field, will be used.
@@ -184,11 +184,11 @@
  * </pre></blockquote>
  *
  * <p>If there are any calendar fields whose values haven't been set in the selected
- * field combination, <code>Calendar</code> uses their default values. The default
+ * field combination, {@code Calendar} uses their default values. The default
  * value of each field may vary by concrete calendar systems. For example, in
- * <code>GregorianCalendar</code>, the default of a field is the same as that
- * of the start of the Epoch: i.e., <code>YEAR = 1970</code>, <code>MONTH =
- * JANUARY</code>, <code>DAY_OF_MONTH = 1</code>, etc.
+ * {@code GregorianCalendar}, the default of a field is the same as that
+ * of the start of the Epoch: i.e., {@code YEAR = 1970}, <code>MONTH =
+ * JANUARY</code>, {@code DAY_OF_MONTH = 1}, etc.
  *
  * <p>
  * <strong>Note:</strong> There are certain possible ambiguities in
@@ -213,98 +213,98 @@
  * <h3>Field Manipulation</h3>
  *
  * The calendar fields can be changed using three methods:
- * <code>set()</code>, <code>add()</code>, and <code>roll()</code>.
+ * {@code set()}, {@code add()}, and {@code roll()}.
  *
- * <p><strong><code>set(f, value)</code></strong> changes calendar field
- * <code>f</code> to <code>value</code>.  In addition, it sets an
- * internal member variable to indicate that calendar field <code>f</code> has
- * been changed. Although calendar field <code>f</code> is changed immediately,
+ * <p><strong>{@code set(f, value)}</strong> changes calendar field
+ * {@code f} to {@code value}.  In addition, it sets an
+ * internal member variable to indicate that calendar field {@code f} has
+ * been changed. Although calendar field {@code f} is changed immediately,
  * the calendar's time value in milliseconds is not recomputed until the next call to
- * <code>get()</code>, <code>getTime()</code>, <code>getTimeInMillis()</code>,
- * <code>add()</code>, or <code>roll()</code> is made. Thus, multiple calls to
- * <code>set()</code> do not trigger multiple, unnecessary
+ * {@code get()}, {@code getTime()}, {@code getTimeInMillis()},
+ * {@code add()}, or {@code roll()} is made. Thus, multiple calls to
+ * {@code set()} do not trigger multiple, unnecessary
  * computations. As a result of changing a calendar field using
- * <code>set()</code>, other calendar fields may also change, depending on the
+ * {@code set()}, other calendar fields may also change, depending on the
  * calendar field, the calendar field value, and the calendar system. In addition,
- * <code>get(f)</code> will not necessarily return <code>value</code> set by
- * the call to the <code>set</code> method
+ * {@code get(f)} will not necessarily return {@code value} set by
+ * the call to the {@code set} method
  * after the calendar fields have been recomputed. The specifics are determined by
  * the concrete calendar class.</p>
  *
- * <p><em>Example</em>: Consider a <code>GregorianCalendar</code>
+ * <p><em>Example</em>: Consider a {@code GregorianCalendar}
  * originally set to August 31, 1999. Calling <code>set(Calendar.MONTH,
  * Calendar.SEPTEMBER)</code> sets the date to September 31,
  * 1999. This is a temporary internal representation that resolves to
- * October 1, 1999 if <code>getTime()</code>is then called. However, a
- * call to <code>set(Calendar.DAY_OF_MONTH, 30)</code> before the call to
- * <code>getTime()</code> sets the date to September 30, 1999, since
- * no recomputation occurs after <code>set()</code> itself.</p>
+ * October 1, 1999 if {@code getTime()}is then called. However, a
+ * call to {@code set(Calendar.DAY_OF_MONTH, 30)} before the call to
+ * {@code getTime()} sets the date to September 30, 1999, since
+ * no recomputation occurs after {@code set()} itself.</p>
  *
- * <p><strong><code>add(f, delta)</code></strong> adds <code>delta</code>
- * to field <code>f</code>.  This is equivalent to calling <code>set(f,
+ * <p><strong>{@code add(f, delta)}</strong> adds {@code delta}
+ * to field {@code f}.  This is equivalent to calling <code>set(f,
  * get(f) + delta)</code> with two adjustments:</p>
  *
  * <blockquote>
- *   <p><strong>Add rule 1</strong>. The value of field <code>f</code>
- *   after the call minus the value of field <code>f</code> before the
- *   call is <code>delta</code>, modulo any overflow that has occurred in
- *   field <code>f</code>. Overflow occurs when a field value exceeds its
+ *   <p><strong>Add rule 1</strong>. The value of field {@code f}
+ *   after the call minus the value of field {@code f} before the
+ *   call is {@code delta}, modulo any overflow that has occurred in
+ *   field {@code f}. Overflow occurs when a field value exceeds its
  *   range and, as a result, the next larger field is incremented or
  *   decremented and the field value is adjusted back into its range.</p>
  *
  *   <p><strong>Add rule 2</strong>. If a smaller field is expected to be
  *   invariant, but it is impossible for it to be equal to its
  *   prior value because of changes in its minimum or maximum after field
- *   <code>f</code> is changed or other constraints, such as time zone
+ *   {@code f} is changed or other constraints, such as time zone
  *   offset changes, then its value is adjusted to be as close
  *   as possible to its expected value. A smaller field represents a
- *   smaller unit of time. <code>HOUR</code> is a smaller field than
- *   <code>DAY_OF_MONTH</code>. No adjustment is made to smaller fields
+ *   smaller unit of time. {@code HOUR} is a smaller field than
+ *   {@code DAY_OF_MONTH}. No adjustment is made to smaller fields
  *   that are not expected to be invariant. The calendar system
  *   determines what fields are expected to be invariant.</p>
  * </blockquote>
  *
- * <p>In addition, unlike <code>set()</code>, <code>add()</code> forces
+ * <p>In addition, unlike {@code set()}, {@code add()} forces
  * an immediate recomputation of the calendar's milliseconds and all
  * fields.</p>
  *
- * <p><em>Example</em>: Consider a <code>GregorianCalendar</code>
+ * <p><em>Example</em>: Consider a {@code GregorianCalendar}
  * originally set to August 31, 1999. Calling <code>add(Calendar.MONTH,
  * 13)</code> sets the calendar to September 30, 2000. <strong>Add rule
- * 1</strong> sets the <code>MONTH</code> field to September, since
+ * 1</strong> sets the {@code MONTH} field to September, since
  * adding 13 months to August gives September of the next year. Since
- * <code>DAY_OF_MONTH</code> cannot be 31 in September in a
- * <code>GregorianCalendar</code>, <strong>add rule 2</strong> sets the
- * <code>DAY_OF_MONTH</code> to 30, the closest possible value. Although
- * it is a smaller field, <code>DAY_OF_WEEK</code> is not adjusted by
+ * {@code DAY_OF_MONTH} cannot be 31 in September in a
+ * {@code GregorianCalendar}, <strong>add rule 2</strong> sets the
+ * {@code DAY_OF_MONTH} to 30, the closest possible value. Although
+ * it is a smaller field, {@code DAY_OF_WEEK} is not adjusted by
  * rule 2, since it is expected to change when the month changes in a
- * <code>GregorianCalendar</code>.</p>
+ * {@code GregorianCalendar}.</p>
  *
- * <p><strong><code>roll(f, delta)</code></strong> adds
- * <code>delta</code> to field <code>f</code> without changing larger
- * fields. This is equivalent to calling <code>add(f, delta)</code> with
+ * <p><strong>{@code roll(f, delta)}</strong> adds
+ * {@code delta} to field {@code f} without changing larger
+ * fields. This is equivalent to calling {@code add(f, delta)} with
  * the following adjustment:</p>
  *
  * <blockquote>
  *   <p><strong>Roll rule</strong>. Larger fields are unchanged after the
  *   call. A larger field represents a larger unit of
- *   time. <code>DAY_OF_MONTH</code> is a larger field than
- *   <code>HOUR</code>.</p>
+ *   time. {@code DAY_OF_MONTH} is a larger field than
+ *   {@code HOUR}.</p>
  * </blockquote>
  *
  * <p><em>Example</em>: See {@link java.util.GregorianCalendar#roll(int, int)}.
  *
  * <p><strong>Usage model</strong>. To motivate the behavior of
- * <code>add()</code> and <code>roll()</code>, consider a user interface
+ * {@code add()} and {@code roll()}, consider a user interface
  * component with increment and decrement buttons for the month, day, and
- * year, and an underlying <code>GregorianCalendar</code>. If the
+ * year, and an underlying {@code GregorianCalendar}. If the
  * interface reads January 31, 1999 and the user presses the month
  * increment button, what should it read? If the underlying
- * implementation uses <code>set()</code>, it might read March 3, 1999. A
+ * implementation uses {@code set()}, it might read March 3, 1999. A
  * better result would be February 28, 1999. Furthermore, if the user
  * presses the month increment button again, it should read March 31,
  * 1999, not March 28, 1999. By saving the original date and using either
- * <code>add()</code> or <code>roll()</code>, depending on whether larger
+ * {@code add()} or {@code roll()}, depending on whether larger
  * fields should be affected, the user interface can behave as most users
  * will intuitively expect.</p>
  *
@@ -369,7 +369,7 @@
     // ranges when they are regenerated.
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
+     * Field number for {@code get} and {@code set} indicating the
      * era, e.g., AD or BC in the Julian calendar. This is a calendar-specific
      * value; see subclass documentation.
      *
@@ -379,16 +379,16 @@
     public static final int ERA = 0;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
+     * Field number for {@code get} and {@code set} indicating the
      * year. This is a calendar-specific value; see subclass documentation.
      */
     public static final int YEAR = 1;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
+     * Field number for {@code get} and {@code set} indicating the
      * month. This is a calendar-specific value. The first month of
      * the year in the Gregorian and Julian calendars is
-     * <code>JANUARY</code> which is 0; the last depends on the number
+     * {@code JANUARY} which is 0; the last depends on the number
      * of months in a year.
      *
      * @see #JANUARY
@@ -408,11 +408,11 @@
     public static final int MONTH = 2;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
+     * Field number for {@code get} and {@code set} indicating the
      * week number within the current year.  The first week of the year, as
-     * defined by <code>getFirstDayOfWeek()</code> and
-     * <code>getMinimalDaysInFirstWeek()</code>, has value 1.  Subclasses define
-     * the value of <code>WEEK_OF_YEAR</code> for days before the first week of
+     * defined by {@code getFirstDayOfWeek()} and
+     * {@code getMinimalDaysInFirstWeek()}, has value 1.  Subclasses define
+     * the value of {@code WEEK_OF_YEAR} for days before the first week of
      * the year.
      *
      * @see #getFirstDayOfWeek
@@ -421,11 +421,11 @@
     public static final int WEEK_OF_YEAR = 3;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
+     * Field number for {@code get} and {@code set} indicating the
      * week number within the current month.  The first week of the month, as
-     * defined by <code>getFirstDayOfWeek()</code> and
-     * <code>getMinimalDaysInFirstWeek()</code>, has value 1.  Subclasses define
-     * the value of <code>WEEK_OF_MONTH</code> for days before the first week of
+     * defined by {@code getFirstDayOfWeek()} and
+     * {@code getMinimalDaysInFirstWeek()}, has value 1.  Subclasses define
+     * the value of {@code WEEK_OF_MONTH} for days before the first week of
      * the month.
      *
      * @see #getFirstDayOfWeek
@@ -434,8 +434,8 @@
     public static final int WEEK_OF_MONTH = 4;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
-     * day of the month. This is a synonym for <code>DAY_OF_MONTH</code>.
+     * Field number for {@code get} and {@code set} indicating the
+     * day of the month. This is a synonym for {@code DAY_OF_MONTH}.
      * The first day of the month has value 1.
      *
      * @see #DAY_OF_MONTH
@@ -443,8 +443,8 @@
     public static final int DATE = 5;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
-     * day of the month. This is a synonym for <code>DATE</code>.
+     * Field number for {@code get} and {@code set} indicating the
+     * day of the month. This is a synonym for {@code DATE}.
      * The first day of the month has value 1.
      *
      * @see #DATE
@@ -452,16 +452,16 @@
     public static final int DAY_OF_MONTH = 5;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the day
+     * Field number for {@code get} and {@code set} indicating the day
      * number within the current year.  The first day of the year has value 1.
      */
     public static final int DAY_OF_YEAR = 6;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the day
-     * of the week.  This field takes values <code>SUNDAY</code>,
-     * <code>MONDAY</code>, <code>TUESDAY</code>, <code>WEDNESDAY</code>,
-     * <code>THURSDAY</code>, <code>FRIDAY</code>, and <code>SATURDAY</code>.
+     * Field number for {@code get} and {@code set} indicating the day
+     * of the week.  This field takes values {@code SUNDAY},
+     * {@code MONDAY}, {@code TUESDAY}, {@code WEDNESDAY},
+     * {@code THURSDAY}, {@code FRIDAY}, and {@code SATURDAY}.
      *
      * @see #SUNDAY
      * @see #MONDAY
@@ -474,24 +474,24 @@
     public static final int DAY_OF_WEEK = 7;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
+     * Field number for {@code get} and {@code set} indicating the
      * ordinal number of the day of the week within the current month. Together
-     * with the <code>DAY_OF_WEEK</code> field, this uniquely specifies a day
-     * within a month.  Unlike <code>WEEK_OF_MONTH</code> and
-     * <code>WEEK_OF_YEAR</code>, this field's value does <em>not</em> depend on
-     * <code>getFirstDayOfWeek()</code> or
-     * <code>getMinimalDaysInFirstWeek()</code>.  <code>DAY_OF_MONTH 1</code>
-     * through <code>7</code> always correspond to <code>DAY_OF_WEEK_IN_MONTH
-     * 1</code>; <code>8</code> through <code>14</code> correspond to
-     * <code>DAY_OF_WEEK_IN_MONTH 2</code>, and so on.
-     * <code>DAY_OF_WEEK_IN_MONTH 0</code> indicates the week before
-     * <code>DAY_OF_WEEK_IN_MONTH 1</code>.  Negative values count back from the
+     * with the {@code DAY_OF_WEEK} field, this uniquely specifies a day
+     * within a month.  Unlike {@code WEEK_OF_MONTH} and
+     * {@code WEEK_OF_YEAR}, this field's value does <em>not</em> depend on
+     * {@code getFirstDayOfWeek()} or
+     * {@code getMinimalDaysInFirstWeek()}.  {@code DAY_OF_MONTH 1}
+     * through {@code 7} always correspond to <code>DAY_OF_WEEK_IN_MONTH
+     * 1</code>; {@code 8} through {@code 14} correspond to
+     * {@code DAY_OF_WEEK_IN_MONTH 2}, and so on.
+     * {@code DAY_OF_WEEK_IN_MONTH 0} indicates the week before
+     * {@code DAY_OF_WEEK_IN_MONTH 1}.  Negative values count back from the
      * end of the month, so the last Sunday of a month is specified as
-     * <code>DAY_OF_WEEK = SUNDAY, DAY_OF_WEEK_IN_MONTH = -1</code>.  Because
+     * {@code DAY_OF_WEEK = SUNDAY, DAY_OF_WEEK_IN_MONTH = -1}.  Because
      * negative values count backward they will usually be aligned differently
      * within the month than positive values.  For example, if a month has 31
-     * days, <code>DAY_OF_WEEK_IN_MONTH -1</code> will overlap
-     * <code>DAY_OF_WEEK_IN_MONTH 5</code> and the end of <code>4</code>.
+     * days, {@code DAY_OF_WEEK_IN_MONTH -1} will overlap
+     * {@code DAY_OF_WEEK_IN_MONTH 5} and the end of {@code 4}.
      *
      * @see #DAY_OF_WEEK
      * @see #WEEK_OF_MONTH
@@ -499,9 +499,9 @@
     public static final int DAY_OF_WEEK_IN_MONTH = 8;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating
-     * whether the <code>HOUR</code> is before or after noon.
-     * E.g., at 10:04:15.250 PM the <code>AM_PM</code> is <code>PM</code>.
+     * Field number for {@code get} and {@code set} indicating
+     * whether the {@code HOUR} is before or after noon.
+     * E.g., at 10:04:15.250 PM the {@code AM_PM} is {@code PM}.
      *
      * @see #AM
      * @see #PM
@@ -510,10 +510,10 @@
     public static final int AM_PM = 9;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
-     * hour of the morning or afternoon. <code>HOUR</code> is used for the
+     * Field number for {@code get} and {@code set} indicating the
+     * hour of the morning or afternoon. {@code HOUR} is used for the
      * 12-hour clock (0 - 11). Noon and midnight are represented by 0, not by 12.
-     * E.g., at 10:04:15.250 PM the <code>HOUR</code> is 10.
+     * E.g., at 10:04:15.250 PM the {@code HOUR} is 10.
      *
      * @see #AM_PM
      * @see #HOUR_OF_DAY
@@ -521,60 +521,60 @@
     public static final int HOUR = 10;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
-     * hour of the day. <code>HOUR_OF_DAY</code> is used for the 24-hour clock.
-     * E.g., at 10:04:15.250 PM the <code>HOUR_OF_DAY</code> is 22.
+     * Field number for {@code get} and {@code set} indicating the
+     * hour of the day. {@code HOUR_OF_DAY} is used for the 24-hour clock.
+     * E.g., at 10:04:15.250 PM the {@code HOUR_OF_DAY} is 22.
      *
      * @see #HOUR
      */
     public static final int HOUR_OF_DAY = 11;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
+     * Field number for {@code get} and {@code set} indicating the
      * minute within the hour.
-     * E.g., at 10:04:15.250 PM the <code>MINUTE</code> is 4.
+     * E.g., at 10:04:15.250 PM the {@code MINUTE} is 4.
      */
     public static final int MINUTE = 12;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
+     * Field number for {@code get} and {@code set} indicating the
      * second within the minute.
-     * E.g., at 10:04:15.250 PM the <code>SECOND</code> is 15.
+     * E.g., at 10:04:15.250 PM the {@code SECOND} is 15.
      */
     public static final int SECOND = 13;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
+     * Field number for {@code get} and {@code set} indicating the
      * millisecond within the second.
-     * E.g., at 10:04:15.250 PM the <code>MILLISECOND</code> is 250.
+     * E.g., at 10:04:15.250 PM the {@code MILLISECOND} is 250.
      */
     public static final int MILLISECOND = 14;
 
     /**
-     * Field number for <code>get</code> and <code>set</code>
+     * Field number for {@code get} and {@code set}
      * indicating the raw offset from GMT in milliseconds.
      * <p>
      * This field reflects the correct GMT offset value of the time
-     * zone of this <code>Calendar</code> if the
-     * <code>TimeZone</code> implementation subclass supports
+     * zone of this {@code Calendar} if the
+     * {@code TimeZone} implementation subclass supports
      * historical GMT offset changes.
      */
     public static final int ZONE_OFFSET = 15;
 
     /**
-     * Field number for <code>get</code> and <code>set</code> indicating the
+     * Field number for {@code get} and {@code set} indicating the
      * daylight saving offset in milliseconds.
      * <p>
      * This field reflects the correct daylight saving offset value of
-     * the time zone of this <code>Calendar</code> if the
-     * <code>TimeZone</code> implementation subclass supports
+     * the time zone of this {@code Calendar} if the
+     * {@code TimeZone} implementation subclass supports
      * historical Daylight Saving Time schedule changes.
      */
     public static final int DST_OFFSET = 16;
 
     /**
-     * The number of distinct fields recognized by <code>get</code> and <code>set</code>.
-     * Field numbers range from <code>0..FIELD_COUNT-1</code>.
+     * The number of distinct fields recognized by {@code get} and {@code set}.
+     * Field numbers range from {@code 0..FIELD_COUNT-1}.
      */
     public static final int FIELD_COUNT = 17;
 
@@ -694,7 +694,7 @@
 
     /**
      * Value of the {@link #MONTH} field indicating the
-     * thirteenth month of the year. Although <code>GregorianCalendar</code>
+     * thirteenth month of the year. Although {@code GregorianCalendar}
      * does not use this value, lunar calendars do.
      */
     public static final int UNDECIMBER = 12;
@@ -839,8 +839,8 @@
 
     /**
      * The calendar field values for the currently set time for this calendar.
-     * This is an array of <code>FIELD_COUNT</code> integers, with index values
-     * <code>ERA</code> through <code>DST_OFFSET</code>.
+     * This is an array of {@code FIELD_COUNT} integers, with index values
+     * {@code ERA} through {@code DST_OFFSET}.
      * @serial
      */
     @SuppressWarnings("ProtectedField")
@@ -850,8 +850,8 @@
      * The flags which tell if a specified calendar field for the calendar is set.
      * A new object has no fields set.  After the first call to a method
      * which generates the fields, they all remain set after that.
-     * This is an array of <code>FIELD_COUNT</code> booleans, with index values
-     * <code>ERA</code> through <code>DST_OFFSET</code>.
+     * This is an array of {@code FIELD_COUNT} booleans, with index values
+     * {@code ERA} through {@code DST_OFFSET}.
      * @serial
      */
     @SuppressWarnings("ProtectedField")
@@ -874,8 +874,8 @@
     protected long          time;
 
     /**
-     * True if then the value of <code>time</code> is valid.
-     * The time is made invalid by a change to an item of <code>field[]</code>.
+     * True if then the value of {@code time} is valid.
+     * The time is made invalid by a change to an item of {@code field[]}.
      * @see #time
      * @serial
      */
@@ -883,10 +883,10 @@
     protected boolean       isTimeSet;
 
     /**
-     * True if <code>fields[]</code> are in sync with the currently set time.
+     * True if {@code fields[]} are in sync with the currently set time.
      * If false, then the next attempt to get the value of a field will
      * force a recomputation of all fields from the current value of
-     * <code>time</code>.
+     * {@code time}.
      * @serial
      */
     @SuppressWarnings("ProtectedField")
@@ -899,8 +899,8 @@
     transient boolean       areAllFieldsSet;
 
     /**
-     * <code>True</code> if this calendar allows out-of-range field values during computation
-     * of <code>time</code> from <code>fields[]</code>.
+     * {@code True} if this calendar allows out-of-range field values during computation
+     * of {@code time} from {@code fields[]}.
      * @see #setLenient
      * @see #isLenient
      * @serial
@@ -908,20 +908,20 @@
     private boolean         lenient = true;
 
     /**
-     * The <code>TimeZone</code> used by this calendar. <code>Calendar</code>
+     * The {@code TimeZone} used by this calendar. {@code Calendar}
      * uses the time zone data to translate between locale and GMT time.
      * @serial
      */
     private TimeZone        zone;
 
     /**
-     * <code>True</code> if zone references to a shared TimeZone object.
+     * {@code True} if zone references to a shared TimeZone object.
      */
     private transient boolean sharedZone = false;
 
     /**
-     * The first day of the week, with possible values <code>SUNDAY</code>,
-     * <code>MONDAY</code>, etc.  This is a locale-dependent value.
+     * The first day of the week, with possible values {@code SUNDAY},
+     * {@code MONDAY}, etc.  This is a locale-dependent value.
      * @serial
      */
     private int             firstDayOfWeek;
@@ -964,10 +964,10 @@
     static final int ALL_FIELDS = (1 << FIELD_COUNT) - 1;
 
     /**
-     * The next available value for <code>stamp[]</code>, an internal array.
+     * The next available value for {@code stamp[]}, an internal array.
      * This actually should not be written out to the stream, and will probably
      * be removed from the stream in the near future.  In the meantime,
-     * a value of <code>MINIMUM_USER_STAMP</code> should be used.
+     * a value of {@code MINIMUM_USER_STAMP} should be used.
      * @serial
      */
     private int             nextStamp = MINIMUM_USER_STAMP;
@@ -997,7 +997,7 @@
      * </dd>
      * </dl>
      * When streaming out this class, the most recent format
-     * and the highest allowable <code>serialVersionOnStream</code>
+     * and the highest allowable {@code serialVersionOnStream}
      * is written.
      * @serial
      * @since 1.1.6
@@ -1307,7 +1307,7 @@
          * Sets the time zone parameter to the given {@code zone}. If no time
          * zone parameter is given to this {@code Calendar.Builder}, the
          * {@linkplain TimeZone#getDefault() default
-         * <code>TimeZone</code>} will be used in the {@link #build() build}
+         * {@code TimeZone}} will be used in the {@link #build() build}
          * method.
          *
          * @param zone the {@link TimeZone}
@@ -1378,7 +1378,7 @@
         /**
          * Sets the locale parameter to the given {@code locale}. If no locale
          * is given to this {@code Calendar.Builder}, the {@linkplain
-         * Locale#getDefault(Locale.Category) default <code>Locale</code>}
+         * Locale#getDefault(Locale.Category) default {@code Locale}}
          * for {@link Locale.Category#FORMAT} will be used.
          *
          * <p>If no calendar type is explicitly given by a call to the
@@ -1614,7 +1614,7 @@
 
     /**
      * Gets a calendar using the default time zone and locale. The
-     * <code>Calendar</code> returned is based on the current time
+     * {@code Calendar} returned is based on the current time
      * in the default time zone with the default
      * {@link Locale.Category#FORMAT FORMAT} locale.
      * <p>
@@ -1632,7 +1632,7 @@
 
     /**
      * Gets a calendar using the specified time zone and default locale.
-     * The <code>Calendar</code> returned is based on the current time
+     * The {@code Calendar} returned is based on the current time
      * in the given time zone with the default
      * {@link Locale.Category#FORMAT FORMAT} locale.
      *
@@ -1646,7 +1646,7 @@
 
     /**
      * Gets a calendar using the default time zone and specified locale.
-     * The <code>Calendar</code> returned is based on the current time
+     * The {@code Calendar} returned is based on the current time
      * in the default time zone with the given locale.
      * <p>
      * If the locale contains the time zone with "tz"
@@ -1663,7 +1663,7 @@
 
     /**
      * Gets a calendar with the specified time zone and locale.
-     * The <code>Calendar</code> returned is based on the current time
+     * The {@code Calendar} returned is based on the current time
      * in the given time zone with the given locale.
      *
      * @param zone the time zone to use
@@ -1738,13 +1738,13 @@
     }
 
     /**
-     * Returns an array of all locales for which the <code>getInstance</code>
+     * Returns an array of all locales for which the {@code getInstance}
      * methods of this class can return localized instances.
-     * The array returned must contain at least a <code>Locale</code>
+     * The array returned must contain at least a {@code Locale}
      * instance equal to {@link java.util.Locale#US Locale.US}.
      *
      * @return An array of locales for which localized
-     *         <code>Calendar</code> instances are available.
+     *         {@code Calendar} instances are available.
      */
     public static synchronized Locale[] getAvailableLocales()
     {
@@ -1774,11 +1774,11 @@
     protected abstract void computeFields();
 
     /**
-     * Returns a <code>Date</code> object representing this
-     * <code>Calendar</code>'s time value (millisecond offset from the <a
+     * Returns a {@code Date} object representing this
+     * {@code Calendar}'s time value (millisecond offset from the <a
      * href="#Epoch">Epoch</a>").
      *
-     * @return a <code>Date</code> representing the time value.
+     * @return a {@code Date} representing the time value.
      * @see #setTime(Date)
      * @see #getTimeInMillis()
      */
@@ -1787,11 +1787,11 @@
     }
 
     /**
-     * Sets this Calendar's time with the given <code>Date</code>.
+     * Sets this Calendar's time with the given {@code Date}.
      * <p>
-     * Note: Calling <code>setTime()</code> with
-     * <code>Date(Long.MAX_VALUE)</code> or <code>Date(Long.MIN_VALUE)</code>
-     * may yield incorrect field values from <code>get()</code>.
+     * Note: Calling {@code setTime()} with
+     * {@code Date(Long.MAX_VALUE)} or {@code Date(Long.MIN_VALUE)}
+     * may yield incorrect field values from {@code get()}.
      *
      * @param date the given Date.
      * @see #getTime()
@@ -1874,7 +1874,7 @@
     /**
      * Sets the value of the given calendar field. This method does
      * not affect any setting state of the field in this
-     * <code>Calendar</code> instance.
+     * {@code Calendar} instance.
      *
      * @throws IndexOutOfBoundsException if the specified field is out of range
      *             (<code>field &lt; 0 || field &gt;= FIELD_COUNT</code>).
@@ -1920,15 +1920,15 @@
     }
 
     /**
-     * Sets the values for the calendar fields <code>YEAR</code>,
-     * <code>MONTH</code>, and <code>DAY_OF_MONTH</code>.
+     * Sets the values for the calendar fields {@code YEAR},
+     * {@code MONTH}, and {@code DAY_OF_MONTH}.
      * Previous values of other calendar fields are retained.  If this is not desired,
      * call {@link #clear()} first.
      *
-     * @param year the value used to set the <code>YEAR</code> calendar field.
-     * @param month the value used to set the <code>MONTH</code> calendar field.
+     * @param year the value used to set the {@code YEAR} calendar field.
+     * @param month the value used to set the {@code MONTH} calendar field.
      * Month value is 0-based. e.g., 0 for January.
-     * @param date the value used to set the <code>DAY_OF_MONTH</code> calendar field.
+     * @param date the value used to set the {@code DAY_OF_MONTH} calendar field.
      * @see #set(int,int)
      * @see #set(int,int,int,int,int)
      * @see #set(int,int,int,int,int,int)
@@ -1941,18 +1941,18 @@
     }
 
     /**
-     * Sets the values for the calendar fields <code>YEAR</code>,
-     * <code>MONTH</code>, <code>DAY_OF_MONTH</code>,
-     * <code>HOUR_OF_DAY</code>, and <code>MINUTE</code>.
+     * Sets the values for the calendar fields {@code YEAR},
+     * {@code MONTH}, {@code DAY_OF_MONTH},
+     * {@code HOUR_OF_DAY}, and {@code MINUTE}.
      * Previous values of other fields are retained.  If this is not desired,
      * call {@link #clear()} first.
      *
-     * @param year the value used to set the <code>YEAR</code> calendar field.
-     * @param month the value used to set the <code>MONTH</code> calendar field.
+     * @param year the value used to set the {@code YEAR} calendar field.
+     * @param month the value used to set the {@code MONTH} calendar field.
      * Month value is 0-based. e.g., 0 for January.
-     * @param date the value used to set the <code>DAY_OF_MONTH</code> calendar field.
-     * @param hourOfDay the value used to set the <code>HOUR_OF_DAY</code> calendar field.
-     * @param minute the value used to set the <code>MINUTE</code> calendar field.
+     * @param date the value used to set the {@code DAY_OF_MONTH} calendar field.
+     * @param hourOfDay the value used to set the {@code HOUR_OF_DAY} calendar field.
+     * @param minute the value used to set the {@code MINUTE} calendar field.
      * @see #set(int,int)
      * @see #set(int,int,int)
      * @see #set(int,int,int,int,int,int)
@@ -1967,19 +1967,19 @@
     }
 
     /**
-     * Sets the values for the fields <code>YEAR</code>, <code>MONTH</code>,
-     * <code>DAY_OF_MONTH</code>, <code>HOUR_OF_DAY</code>, <code>MINUTE</code>, and
-     * <code>SECOND</code>.
+     * Sets the values for the fields {@code YEAR}, {@code MONTH},
+     * {@code DAY_OF_MONTH}, {@code HOUR_OF_DAY}, {@code MINUTE}, and
+     * {@code SECOND}.
      * Previous values of other fields are retained.  If this is not desired,
      * call {@link #clear()} first.
      *
-     * @param year the value used to set the <code>YEAR</code> calendar field.
-     * @param month the value used to set the <code>MONTH</code> calendar field.
+     * @param year the value used to set the {@code YEAR} calendar field.
+     * @param month the value used to set the {@code MONTH} calendar field.
      * Month value is 0-based. e.g., 0 for January.
-     * @param date the value used to set the <code>DAY_OF_MONTH</code> calendar field.
-     * @param hourOfDay the value used to set the <code>HOUR_OF_DAY</code> calendar field.
-     * @param minute the value used to set the <code>MINUTE</code> calendar field.
-     * @param second the value used to set the <code>SECOND</code> calendar field.
+     * @param date the value used to set the {@code DAY_OF_MONTH} calendar field.
+     * @param hourOfDay the value used to set the {@code HOUR_OF_DAY} calendar field.
+     * @param minute the value used to set the {@code MINUTE} calendar field.
+     * @param second the value used to set the {@code SECOND} calendar field.
      * @see #set(int,int)
      * @see #set(int,int,int)
      * @see #set(int,int,int,int,int)
@@ -1998,14 +1998,14 @@
     /**
      * Sets all the calendar field values and the time value
      * (millisecond offset from the <a href="#Epoch">Epoch</a>) of
-     * this <code>Calendar</code> undefined. This means that {@link
-     * #isSet(int) isSet()} will return <code>false</code> for all the
+     * this {@code Calendar} undefined. This means that {@link
+     * #isSet(int) isSet()} will return {@code false} for all the
      * calendar fields, and the date and time calculations will treat
      * the fields as if they had never been set. A
-     * <code>Calendar</code> implementation class may use its specific
+     * {@code Calendar} implementation class may use its specific
      * default field values for date/time calculations. For example,
-     * <code>GregorianCalendar</code> uses 1970 if the
-     * <code>YEAR</code> field value is undefined.
+     * {@code GregorianCalendar} uses 1970 if the
+     * {@code YEAR} field value is undefined.
      *
      * @see #clear(int)
      */
@@ -2022,10 +2022,10 @@
     /**
      * Sets the given calendar field value and the time value
      * (millisecond offset from the <a href="#Epoch">Epoch</a>) of
-     * this <code>Calendar</code> undefined. This means that {@link
-     * #isSet(int) isSet(field)} will return <code>false</code>, and
+     * this {@code Calendar} undefined. This means that {@link
+     * #isSet(int) isSet(field)} will return {@code false}, and
      * the date and time calculations will treat the field as if it
-     * had never been set. A <code>Calendar</code> implementation
+     * had never been set. A {@code Calendar} implementation
      * class may use the field's specific default value for date and
      * time calculations.
      *
@@ -2033,7 +2033,7 @@
      * fields are handled independently and the <a
      * href="#time_resolution">the resolution rule for the time of
      * day</a> is applied. Clearing one of the fields doesn't reset
-     * the hour of day value of this <code>Calendar</code>. Use {@link
+     * the hour of day value of this {@code Calendar}. Use {@link
      * #set(int,int) set(Calendar.HOUR_OF_DAY, 0)} to reset the hour
      * value.
      *
@@ -2053,11 +2053,11 @@
     /**
      * Determines if the given calendar field has a value set,
      * including cases that the value has been set by internal fields
-     * calculations triggered by a <code>get</code> method call.
+     * calculations triggered by a {@code get} method call.
      *
      * @param field the calendar field to test
-     * @return <code>true</code> if the given calendar field has a value set;
-     * <code>false</code> otherwise.
+     * @return {@code true} if the given calendar field has a value set;
+     * {@code false} otherwise.
      */
     public final boolean isSet(int field)
     {
@@ -2066,24 +2066,24 @@
 
     /**
      * Returns the string representation of the calendar
-     * <code>field</code> value in the given <code>style</code> and
-     * <code>locale</code>.  If no string representation is
-     * applicable, <code>null</code> is returned. This method calls
+     * {@code field} value in the given {@code style} and
+     * {@code locale}.  If no string representation is
+     * applicable, {@code null} is returned. This method calls
      * {@link Calendar#get(int) get(field)} to get the calendar
-     * <code>field</code> value if the string representation is
-     * applicable to the given calendar <code>field</code>.
+     * {@code field} value if the string representation is
+     * applicable to the given calendar {@code field}.
      *
-     * <p>For example, if this <code>Calendar</code> is a
-     * <code>GregorianCalendar</code> and its date is 2005-01-01, then
+     * <p>For example, if this {@code Calendar} is a
+     * {@code GregorianCalendar} and its date is 2005-01-01, then
      * the string representation of the {@link #MONTH} field would be
      * "January" in the long style in an English locale or "Jan" in
      * the short style. However, no string representation would be
      * available for the {@link #DAY_OF_MONTH} field, and this method
-     * would return <code>null</code>.
+     * would return {@code null}.
      *
      * <p>The default implementation supports the calendar fields for
      * which a {@link DateFormatSymbols} has names in the given
-     * <code>locale</code>.
+     * {@code locale}.
      *
      * @param field
      *        the calendar field for which the string representation
@@ -2309,10 +2309,10 @@
      * externally by calling one of the setter methods rather than by the
      * internal time calculation.
      *
-     * @return <code>true</code> if the field has been set externally,
-     * <code>false</code> otherwise.
+     * @return {@code true} if the field has been set externally,
+     * {@code false} otherwise.
      * @throws    IndexOutOfBoundsException if the specified
-     *                <code>field</code> is out of range
+     *                {@code field} is out of range
      *               (<code>field &lt; 0 || field &gt;= FIELD_COUNT</code>).
      * @see #selectFields()
      * @see #setFieldsComputed(int)
@@ -2345,7 +2345,7 @@
      *
      * @param fieldMask the field to be marked as computed.
      * @throws    IndexOutOfBoundsException if the specified
-     *                <code>field</code> is out of range
+     *                {@code field} is out of range
      *               (<code>field &lt; 0 || field &gt;= FIELD_COUNT</code>).
      * @see #isExternallySet(int)
      * @see #selectFields()
@@ -2374,15 +2374,15 @@
 
     /**
      * Sets the state of the calendar fields that are <em>not</em> specified
-     * by <code>fieldMask</code> to <em>unset</em>. If <code>fieldMask</code>
+     * by {@code fieldMask} to <em>unset</em>. If {@code fieldMask}
      * specifies all the calendar fields, then the state of this
-     * <code>Calendar</code> becomes that all the calendar fields are in sync
+     * {@code Calendar} becomes that all the calendar fields are in sync
      * with the time value (millisecond offset from the Epoch).
      *
      * @param fieldMask the field mask indicating which calendar fields are in
      * sync with the time value.
      * @throws    IndexOutOfBoundsException if the specified
-     *                <code>field</code> is out of range
+     *                {@code field} is out of range
      *               (<code>field &lt; 0 || field &gt;= FIELD_COUNT</code>).
      * @see #isExternallySet(int)
      * @see #selectFields()
@@ -2428,8 +2428,8 @@
     }
 
     /**
-     * Returns whether the specified <code>field</code> is on in the
-     * <code>fieldMask</code>.
+     * Returns whether the specified {@code field} is on in the
+     * {@code fieldMask}.
      */
     static boolean isFieldSet(int fieldMask, int field) {
         return (fieldMask & (1 << field)) != 0;
@@ -2439,16 +2439,16 @@
      * Returns a field mask indicating which calendar field values
      * to be used to calculate the time value. The calendar fields are
      * returned as a bit mask, each bit of which corresponds to a field, i.e.,
-     * the mask value of <code>field</code> is <code>(1 &lt;&lt;
-     * field)</code>. For example, 0x26 represents the <code>YEAR</code>,
-     * <code>MONTH</code>, and <code>DAY_OF_MONTH</code> fields (i.e., 0x26 is
+     * the mask value of {@code field} is <code>(1 &lt;&lt;
+     * field)</code>. For example, 0x26 represents the {@code YEAR},
+     * {@code MONTH}, and {@code DAY_OF_MONTH} fields (i.e., 0x26 is
      * equal to
      * <code>(1&lt;&lt;YEAR)|(1&lt;&lt;MONTH)|(1&lt;&lt;DAY_OF_MONTH))</code>.
      *
      * <p>This method supports the calendar fields resolution as described in
      * the class description. If the bit mask for a given field is on and its
-     * field has not been set (i.e., <code>isSet(field)</code> is
-     * <code>false</code>), then the default value of the field has to be
+     * field has not been set (i.e., {@code isSet(field)} is
+     * {@code false}), then the default value of the field has to be
      * used, which case means that the field has been selected because the
      * selected combination involves the field.
      *
@@ -2693,26 +2693,26 @@
     }
 
     /**
-     * Compares this <code>Calendar</code> to the specified
-     * <code>Object</code>.  The result is <code>true</code> if and only if
-     * the argument is a <code>Calendar</code> object of the same calendar
+     * Compares this {@code Calendar} to the specified
+     * {@code Object}.  The result is {@code true} if and only if
+     * the argument is a {@code Calendar} object of the same calendar
      * system that represents the same time value (millisecond offset from the
      * <a href="#Epoch">Epoch</a>) under the same
-     * <code>Calendar</code> parameters as this object.
+     * {@code Calendar} parameters as this object.
      *
-     * <p>The <code>Calendar</code> parameters are the values represented
-     * by the <code>isLenient</code>, <code>getFirstDayOfWeek</code>,
-     * <code>getMinimalDaysInFirstWeek</code> and <code>getTimeZone</code>
+     * <p>The {@code Calendar} parameters are the values represented
+     * by the {@code isLenient}, {@code getFirstDayOfWeek},
+     * {@code getMinimalDaysInFirstWeek} and {@code getTimeZone}
      * methods. If there is any difference in those parameters
-     * between the two <code>Calendar</code>s, this method returns
-     * <code>false</code>.
+     * between the two {@code Calendar}s, this method returns
+     * {@code false}.
      *
      * <p>Use the {@link #compareTo(Calendar) compareTo} method to
      * compare only the time values.
      *
      * @param obj the object to compare with.
-     * @return <code>true</code> if this object is equal to <code>obj</code>;
-     * <code>false</code> otherwise.
+     * @return {@code true} if this object is equal to {@code obj};
+     * {@code false} otherwise.
      */
     @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
     @Override
@@ -2753,19 +2753,19 @@
     }
 
     /**
-     * Returns whether this <code>Calendar</code> represents a time
+     * Returns whether this {@code Calendar} represents a time
      * before the time represented by the specified
-     * <code>Object</code>. This method is equivalent to:
+     * {@code Object}. This method is equivalent to:
      * <pre>{@code
      *         compareTo(when) < 0
      * }</pre>
-     * if and only if <code>when</code> is a <code>Calendar</code>
-     * instance. Otherwise, the method returns <code>false</code>.
+     * if and only if {@code when} is a {@code Calendar}
+     * instance. Otherwise, the method returns {@code false}.
      *
-     * @param when the <code>Object</code> to be compared
-     * @return <code>true</code> if the time of this
-     * <code>Calendar</code> is before the time represented by
-     * <code>when</code>; <code>false</code> otherwise.
+     * @param when the {@code Object} to be compared
+     * @return {@code true} if the time of this
+     * {@code Calendar} is before the time represented by
+     * {@code when}; {@code false} otherwise.
      * @see     #compareTo(Calendar)
      */
     public boolean before(Object when) {
@@ -2774,18 +2774,18 @@
     }
 
     /**
-     * Returns whether this <code>Calendar</code> represents a time
+     * Returns whether this {@code Calendar} represents a time
      * after the time represented by the specified
-     * <code>Object</code>. This method is equivalent to:
+     * {@code Object}. This method is equivalent to:
      * <pre>{@code
      *         compareTo(when) > 0
      * }</pre>
-     * if and only if <code>when</code> is a <code>Calendar</code>
-     * instance. Otherwise, the method returns <code>false</code>.
+     * if and only if {@code when} is a {@code Calendar}
+     * instance. Otherwise, the method returns {@code false}.
      *
-     * @param when the <code>Object</code> to be compared
-     * @return <code>true</code> if the time of this <code>Calendar</code> is
-     * after the time represented by <code>when</code>; <code>false</code>
+     * @param when the {@code Object} to be compared
+     * @return {@code true} if the time of this {@code Calendar} is
+     * after the time represented by {@code when}; {@code false}
      * otherwise.
      * @see     #compareTo(Calendar)
      */
@@ -2797,19 +2797,19 @@
     /**
      * Compares the time values (millisecond offsets from the <a
      * href="#Epoch">Epoch</a>) represented by two
-     * <code>Calendar</code> objects.
+     * {@code Calendar} objects.
      *
-     * @param anotherCalendar the <code>Calendar</code> to be compared.
-     * @return the value <code>0</code> if the time represented by the argument
-     * is equal to the time represented by this <code>Calendar</code>; a value
-     * less than <code>0</code> if the time of this <code>Calendar</code> is
+     * @param anotherCalendar the {@code Calendar} to be compared.
+     * @return the value {@code 0} if the time represented by the argument
+     * is equal to the time represented by this {@code Calendar}; a value
+     * less than {@code 0} if the time of this {@code Calendar} is
      * before the time represented by the argument; and a value greater than
-     * <code>0</code> if the time of this <code>Calendar</code> is after the
+     * {@code 0} if the time of this {@code Calendar} is after the
      * time represented by the argument.
-     * @throws    NullPointerException if the specified <code>Calendar</code> is
-     *            <code>null</code>.
+     * @throws    NullPointerException if the specified {@code Calendar} is
+     *            {@code null}.
      * @throws    IllegalArgumentException if the time value of the
-     * specified <code>Calendar</code> object can't be obtained due to
+     * specified {@code Calendar} object can't be obtained due to
      * any invalid calendar values.
      * @since   1.5
      */
@@ -2822,7 +2822,7 @@
      * Adds or subtracts the specified amount of time to the given calendar field,
      * based on the calendar's rules. For example, to subtract 5 days from
      * the current time of the calendar, you can achieve it by calling:
-     * <p><code>add(Calendar.DAY_OF_MONTH, -5)</code>.
+     * <p>{@code add(Calendar.DAY_OF_MONTH, -5)}.
      *
      * @param field the calendar field.
      * @param amount the amount of date or time to be added to the field.
@@ -2838,7 +2838,7 @@
      * <p>roll(Calendar.DATE, true).
      * When rolling on the year or Calendar.YEAR field, it will roll the year
      * value in the range between 1 and the value returned by calling
-     * <code>getMaximum(Calendar.YEAR)</code>.
+     * {@code getMaximum(Calendar.YEAR)}.
      * When rolling on the month or Calendar.MONTH field, other fields like
      * date might conflict and, need to be changed. For instance,
      * rolling the month on the date 01/31/96 will result in 02/29/96.
@@ -2858,15 +2858,15 @@
      * without changing larger fields.  A negative amount means to roll
      * down.
      *
-     * <p>NOTE:  This default implementation on <code>Calendar</code> just repeatedly calls the
+     * <p>NOTE:  This default implementation on {@code Calendar} just repeatedly calls the
      * version of {@link #roll(int,boolean) roll()} that rolls by one unit.  This may not
-     * always do the right thing.  For example, if the <code>DAY_OF_MONTH</code> field is 31,
-     * rolling through February will leave it set to 28.  The <code>GregorianCalendar</code>
+     * always do the right thing.  For example, if the {@code DAY_OF_MONTH} field is 31,
+     * rolling through February will leave it set to 28.  The {@code GregorianCalendar}
      * version of this function takes care of this problem.  Other subclasses
      * should also provide overrides of this function that do the right thing.
      *
      * @param field the calendar field.
-     * @param amount the signed amount to add to the calendar <code>field</code>.
+     * @param amount the signed amount to add to the calendar {@code field}.
      * @since 1.2
      * @see #roll(int,boolean)
      * @see #add(int,int)
@@ -2929,7 +2929,7 @@
     }
 
     /**
-     * Sets the sharedZone flag to <code>shared</code>.
+     * Sets the sharedZone flag to {@code shared}.
      */
     void setZoneShared(boolean shared) {
         sharedZone = shared;
@@ -2942,8 +2942,8 @@
      * With strict (non-lenient) interpretation, such dates will cause an exception to be
      * thrown. The default is lenient.
      *
-     * @param lenient <code>true</code> if the lenient mode is to be turned
-     * on; <code>false</code> if it is to be turned off.
+     * @param lenient {@code true} if the lenient mode is to be turned
+     * on; {@code false} if it is to be turned off.
      * @see #isLenient()
      * @see java.text.DateFormat#setLenient
      */
@@ -2955,8 +2955,8 @@
     /**
      * Tells whether date/time interpretation is to be lenient.
      *
-     * @return <code>true</code> if the interpretation mode of this calendar is lenient;
-     * <code>false</code> otherwise.
+     * @return {@code true} if the interpretation mode of this calendar is lenient;
+     * {@code false} otherwise.
      * @see #setLenient(boolean)
      */
     public boolean isLenient()
@@ -2965,8 +2965,8 @@
     }
 
     /**
-     * Sets what the first day of the week is; e.g., <code>SUNDAY</code> in the U.S.,
-     * <code>MONDAY</code> in France.
+     * Sets what the first day of the week is; e.g., {@code SUNDAY} in the U.S.,
+     * {@code MONDAY} in France.
      *
      * @param value the given first day of the week.
      * @see #getFirstDayOfWeek()
@@ -2982,8 +2982,8 @@
     }
 
     /**
-     * Gets what the first day of the week is; e.g., <code>SUNDAY</code> in the U.S.,
-     * <code>MONDAY</code> in France.
+     * Gets what the first day of the week is; e.g., {@code SUNDAY} in the U.S.,
+     * {@code MONDAY} in France.
      *
      * @return the first day of the week.
      * @see #setFirstDayOfWeek(int)
@@ -3125,7 +3125,7 @@
 
     /**
      * Returns the minimum value for the given calendar field of this
-     * <code>Calendar</code> instance. The minimum value is defined as
+     * {@code Calendar} instance. The minimum value is defined as
      * the smallest value returned by the {@link #get(int) get} method
      * for any possible time value.  The minimum value depends on
      * calendar system specific parameters of the instance.
@@ -3142,7 +3142,7 @@
 
     /**
      * Returns the maximum value for the given calendar field of this
-     * <code>Calendar</code> instance. The maximum value is defined as
+     * {@code Calendar} instance. The maximum value is defined as
      * the largest value returned by the {@link #get(int) get} method
      * for any possible time value. The maximum value depends on
      * calendar system specific parameters of the instance.
@@ -3159,7 +3159,7 @@
 
     /**
      * Returns the highest minimum value for the given calendar field
-     * of this <code>Calendar</code> instance. The highest minimum
+     * of this {@code Calendar} instance. The highest minimum
      * value is defined as the largest value returned by {@link
      * #getActualMinimum(int)} for any possible time value. The
      * greatest minimum value depends on calendar system specific
@@ -3177,13 +3177,13 @@
 
     /**
      * Returns the lowest maximum value for the given calendar field
-     * of this <code>Calendar</code> instance. The lowest maximum
+     * of this {@code Calendar} instance. The lowest maximum
      * value is defined as the smallest value returned by {@link
      * #getActualMaximum(int)} for any possible time value. The least
      * maximum value depends on calendar system specific parameters of
-     * the instance. For example, a <code>Calendar</code> for the
+     * the instance. For example, a {@code Calendar} for the
      * Gregorian calendar system returns 28 for the
-     * <code>DAY_OF_MONTH</code> field, because the 28th is the last
+     * {@code DAY_OF_MONTH} field, because the 28th is the last
      * day of the shortest month of this calendar, February in a
      * common year.
      *
@@ -3199,17 +3199,17 @@
 
     /**
      * Returns the minimum value that the specified calendar field
-     * could have, given the time value of this <code>Calendar</code>.
+     * could have, given the time value of this {@code Calendar}.
      *
      * <p>The default implementation of this method uses an iterative
      * algorithm to determine the actual minimum value for the
      * calendar field. Subclasses should, if possible, override this
      * with a more efficient implementation - in many cases, they can
-     * simply return <code>getMinimum()</code>.
+     * simply return {@code getMinimum()}.
      *
      * @param field the calendar field
      * @return the minimum of the given calendar field for the time
-     * value of this <code>Calendar</code>
+     * value of this {@code Calendar}
      * @see #getMinimum(int)
      * @see #getMaximum(int)
      * @see #getGreatestMinimum(int)
@@ -3252,8 +3252,8 @@
     /**
      * Returns the maximum value that the specified calendar field
      * could have, given the time value of this
-     * <code>Calendar</code>. For example, the actual maximum value of
-     * the <code>MONTH</code> field is 12 in some years, and 13 in
+     * {@code Calendar}. For example, the actual maximum value of
+     * the {@code MONTH} field is 12 in some years, and 13 in
      * other years in the Hebrew calendar system.
      *
      * <p>The default implementation of this method uses an iterative
@@ -3263,7 +3263,7 @@
      *
      * @param field the calendar field
      * @return the maximum of the given calendar field for the time
-     * value of this <code>Calendar</code>
+     * value of this {@code Calendar}
      * @see #getMinimum(int)
      * @see #getMaximum(int)
      * @see #getGreatestMinimum(int)
@@ -3351,7 +3351,7 @@
      *
      * @param field the calendar field
      * @return the calendar field name
-     * @throws    IndexOutOfBoundsException if <code>field</code> is negative,
+     * @throws    IndexOutOfBoundsException if {@code field} is negative,
      * equal to or greater than {@code FIELD_COUNT}.
      */
     static String getFieldName(int field) {
@@ -3362,7 +3362,7 @@
      * Return a string representation of this calendar. This method
      * is intended to be used only for debugging purposes, and the
      * format of the returned string may vary between implementations.
-     * The returned string may be empty but may not be <code>null</code>.
+     * The returned string may be empty but may not be {@code null}.
      *
      * @return  a string representation of this calendar.
      */
@@ -3517,13 +3517,13 @@
     /**
      * Save the state of this object to a stream (i.e., serialize it).
      *
-     * Ideally, <code>Calendar</code> would only write out its state data and
+     * Ideally, {@code Calendar} would only write out its state data and
      * the current time, and not write any field data out, such as
-     * <code>fields[]</code>, <code>isTimeSet</code>, <code>areFieldsSet</code>,
-     * and <code>isSet[]</code>.  <code>nextStamp</code> also should not be part
+     * {@code fields[]}, {@code isTimeSet}, {@code areFieldsSet},
+     * and {@code isSet[]}.  {@code nextStamp} also should not be part
      * of the persistent state. Unfortunately, this didn't happen before JDK 1.1
      * shipped. To be compatible with JDK 1.1, we will always have to write out
-     * the field values and state flags.  However, <code>nextStamp</code> can be
+     * the field values and state flags.  However, {@code nextStamp} can be
      * removed from the serialization stream; this will probably happen in the
      * near future.
      */
--- a/src/java.base/share/classes/java/util/ConcurrentModificationException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/ConcurrentModificationException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -107,7 +107,7 @@
      * Constructs a new exception with the specified detail message and
      * cause.
      *
-     * <p>Note that the detail message associated with <code>cause</code> is
+     * <p>Note that the detail message associated with {@code cause} is
      * <i>not</i> automatically incorporated in this exception's detail
      * message.
      *
--- a/src/java.base/share/classes/java/util/Currency.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/Currency.java	Tue Sep 24 09:43:43 2019 +0100
@@ -55,9 +55,9 @@
  * ISO web site</a> for more information.
  * <p>
  * The class is designed so that there's never more than one
- * <code>Currency</code> instance for any given currency. Therefore, there's
- * no public constructor. You obtain a <code>Currency</code> instance using
- * the <code>getInstance</code> methods.
+ * {@code Currency} instance for any given currency. Therefore, there's
+ * no public constructor. You obtain a {@code Currency} instance using
+ * the {@code getInstance} methods.
  * <p>
  * Users can supersede the Java runtime currency data by means of the system
  * property {@systemProperty java.util.currency.data}. If this system property is
@@ -274,7 +274,7 @@
 
 
     /**
-     * Constructs a <code>Currency</code> instance. The constructor is private
+     * Constructs a {@code Currency} instance. The constructor is private
      * so that we can insure that there's never more than one instance for a
      * given currency.
      */
@@ -285,12 +285,12 @@
     }
 
     /**
-     * Returns the <code>Currency</code> instance for the given currency code.
+     * Returns the {@code Currency} instance for the given currency code.
      *
      * @param currencyCode the ISO 4217 code of the currency
-     * @return the <code>Currency</code> instance for the given currency code
-     * @throws    NullPointerException if <code>currencyCode</code> is null
-     * @throws    IllegalArgumentException if <code>currencyCode</code> is not
+     * @return the {@code Currency} instance for the given currency code
+     * @throws    NullPointerException if {@code currencyCode} is null
+     * @throws    IllegalArgumentException if {@code currencyCode} is not
      * a supported ISO 4217 code.
      */
     public static Currency getInstance(String currencyCode) {
@@ -350,7 +350,7 @@
     }
 
     /**
-     * Returns the <code>Currency</code> instance for the country of the
+     * Returns the {@code Currency} instance for the country of the
      * given locale. The language and variant components of the locale
      * are ignored. The result may vary over time, as countries change their
      * currencies. For example, for the original member countries of the
@@ -365,14 +365,14 @@
      * specified, the currency from the "cu" extension supersedes the implicit one
      * from the "rg" extension.
      * <p>
-     * The method returns <code>null</code> for territories that don't
+     * The method returns {@code null} for territories that don't
      * have a currency, such as Antarctica.
      *
-     * @param locale the locale for whose country a <code>Currency</code>
+     * @param locale the locale for whose country a {@code Currency}
      * instance is needed
-     * @return the <code>Currency</code> instance for the country of the given
+     * @return the {@code Currency} instance for the country of the given
      * locale, or {@code null}
-     * @throws    NullPointerException if <code>locale</code>
+     * @throws    NullPointerException if {@code locale}
      * is {@code null}
      * @throws    IllegalArgumentException if the country of the given {@code locale}
      * is not a supported ISO 3166 country code.
@@ -537,7 +537,7 @@
      * @param locale the locale for which a display name for this currency is
      * needed
      * @return the symbol of this currency for the specified locale
-     * @throws    NullPointerException if <code>locale</code> is null
+     * @throws    NullPointerException if {@code locale} is null
      */
     public String getSymbol(Locale locale) {
         LocaleServiceProviderPool pool =
@@ -632,7 +632,7 @@
      * @param locale the locale for which a display name for this currency is
      * needed
      * @return the display name of this currency for the specified locale
-     * @throws    NullPointerException if <code>locale</code> is null
+     * @throws    NullPointerException if {@code locale} is null
      * @since 1.7
      */
     public String getDisplayName(Locale locale) {
--- a/src/java.base/share/classes/java/util/GregorianCalendar.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/GregorianCalendar.java	Tue Sep 24 09:43:43 2019 +0100
@@ -53,11 +53,11 @@
 import sun.util.calendar.ZoneInfo;
 
 /**
- * <code>GregorianCalendar</code> is a concrete subclass of
- * <code>Calendar</code> and provides the standard calendar system
+ * {@code GregorianCalendar} is a concrete subclass of
+ * {@code Calendar} and provides the standard calendar system
  * used by most of the world.
  *
- * <p> <code>GregorianCalendar</code> is a hybrid calendar that
+ * <p> {@code GregorianCalendar} is a hybrid calendar that
  * supports both the Julian and Gregorian calendar systems with the
  * support of a single discontinuity, which corresponds by default to
  * the Gregorian date when the Gregorian calendar was instituted
@@ -68,19 +68,19 @@
  * <p>
  * Historically, in those countries which adopted the Gregorian calendar first,
  * October 4, 1582 (Julian) was thus followed by October 15, 1582 (Gregorian). This calendar models
- * this correctly.  Before the Gregorian cutover, <code>GregorianCalendar</code>
+ * this correctly.  Before the Gregorian cutover, {@code GregorianCalendar}
  * implements the Julian calendar.  The only difference between the Gregorian
  * and the Julian calendar is the leap year rule. The Julian calendar specifies
  * leap years every four years, whereas the Gregorian calendar omits century
  * years which are not divisible by 400.
  *
  * <p>
- * <code>GregorianCalendar</code> implements <em>proleptic</em> Gregorian and
+ * {@code GregorianCalendar} implements <em>proleptic</em> Gregorian and
  * Julian calendars. That is, dates are computed by extrapolating the current
  * rules indefinitely far backward and forward in time. As a result,
- * <code>GregorianCalendar</code> may be used for all years to generate
+ * {@code GregorianCalendar} may be used for all years to generate
  * meaningful and consistent results. However, dates obtained using
- * <code>GregorianCalendar</code> are historically accurate only from March 1, 4
+ * {@code GregorianCalendar} are historically accurate only from March 1, 4
  * AD onward, when modern Julian calendar rules were adopted.  Before this date,
  * leap year rules were applied irregularly, and before 45 BC the Julian
  * calendar did not even exist.
@@ -135,28 +135,28 @@
  *
  * <h3>Week Of Month</h3>
  *
- * <p>Values calculated for the <code>WEEK_OF_MONTH</code> field range from 0
+ * <p>Values calculated for the {@code WEEK_OF_MONTH} field range from 0
  * to 6.  Week 1 of a month (the days with <code>WEEK_OF_MONTH =
  * 1</code>) is the earliest set of at least
- * <code>getMinimalDaysInFirstWeek()</code> contiguous days in that month,
- * ending on the day before <code>getFirstDayOfWeek()</code>.  Unlike
+ * {@code getMinimalDaysInFirstWeek()} contiguous days in that month,
+ * ending on the day before {@code getFirstDayOfWeek()}.  Unlike
  * week 1 of a year, week 1 of a month may be shorter than 7 days, need
- * not start on <code>getFirstDayOfWeek()</code>, and will not include days of
+ * not start on {@code getFirstDayOfWeek()}, and will not include days of
  * the previous month.  Days of a month before week 1 have a
- * <code>WEEK_OF_MONTH</code> of 0.
+ * {@code WEEK_OF_MONTH} of 0.
  *
- * <p>For example, if <code>getFirstDayOfWeek()</code> is <code>SUNDAY</code>
- * and <code>getMinimalDaysInFirstWeek()</code> is 4, then the first week of
+ * <p>For example, if {@code getFirstDayOfWeek()} is {@code SUNDAY}
+ * and {@code getMinimalDaysInFirstWeek()} is 4, then the first week of
  * January 1998 is Sunday, January 4 through Saturday, January 10.  These days
- * have a <code>WEEK_OF_MONTH</code> of 1.  Thursday, January 1 through
- * Saturday, January 3 have a <code>WEEK_OF_MONTH</code> of 0.  If
- * <code>getMinimalDaysInFirstWeek()</code> is changed to 3, then January 1
- * through January 3 have a <code>WEEK_OF_MONTH</code> of 1.
+ * have a {@code WEEK_OF_MONTH} of 1.  Thursday, January 1 through
+ * Saturday, January 3 have a {@code WEEK_OF_MONTH} of 0.  If
+ * {@code getMinimalDaysInFirstWeek()} is changed to 3, then January 1
+ * through January 3 have a {@code WEEK_OF_MONTH} of 1.
  *
  * <h3>Default Fields Values</h3>
  *
- * <p>The <code>clear</code> method sets calendar field(s)
- * undefined. <code>GregorianCalendar</code> uses the following
+ * <p>The {@code clear} method sets calendar field(s)
+ * undefined. {@code GregorianCalendar} uses the following
  * default value for each calendar field if its value is undefined.
  *
  * <table class="striped" style="text-align: left; width: 66%;">
@@ -174,74 +174,74 @@
  *   <tbody>
  *     <tr>
  *       <th scope="row">
- *              <code>ERA</code>
+ *              {@code ERA}
  *       </th>
  *       <td>
- *              <code>AD</code>
+ *              {@code AD}
  *       </td>
  *     </tr>
  *     <tr>
  *       <th scope="row">
- *              <code>YEAR</code>
+ *              {@code YEAR}
  *       </th>
  *       <td>
- *              <code>1970</code>
+ *              {@code 1970}
  *       </td>
  *     </tr>
  *     <tr>
  *       <th scope="row">
- *              <code>MONTH</code>
+ *              {@code MONTH}
  *       </th>
  *       <td>
- *              <code>JANUARY</code>
+ *              {@code JANUARY}
  *       </td>
  *     </tr>
  *     <tr>
  *       <th scope="row">
- *              <code>DAY_OF_MONTH</code>
+ *              {@code DAY_OF_MONTH}
  *       </th>
  *       <td>
- *              <code>1</code>
+ *              {@code 1}
  *       </td>
  *     </tr>
  *     <tr>
  *       <th scope="row">
- *              <code>DAY_OF_WEEK</code>
+ *              {@code DAY_OF_WEEK}
  *       </th>
  *       <td>
- *              <code>the first day of week</code>
+ *              {@code the first day of week}
  *       </td>
  *     </tr>
  *     <tr>
  *       <th scope="row">
- *              <code>WEEK_OF_MONTH</code>
+ *              {@code WEEK_OF_MONTH}
  *       </th>
  *       <td>
- *              <code>0</code>
+ *              {@code 0}
  *       </td>
  *     </tr>
  *     <tr>
  *       <th scope="row">
- *              <code>DAY_OF_WEEK_IN_MONTH</code>
+ *              {@code DAY_OF_WEEK_IN_MONTH}
  *       </th>
  *       <td>
- *              <code>1</code>
+ *              {@code 1}
  *       </td>
  *     </tr>
  *     <tr>
  *       <th scope="row">
- *              <code>AM_PM</code>
+ *              {@code AM_PM}
  *       </th>
  *       <td>
- *              <code>AM</code>
+ *              {@code AM}
  *       </td>
  *     </tr>
  *     <tr>
  *       <th scope="row">
- *              <code>HOUR, HOUR_OF_DAY, MINUTE, SECOND, MILLISECOND</code>
+ *              {@code HOUR, HOUR_OF_DAY, MINUTE, SECOND, MILLISECOND}
  *       </th>
  *       <td>
- *              <code>0</code>
+ *              {@code 0}
  *       </td>
  *     </tr>
  *   </tbody>
@@ -360,9 +360,9 @@
 //////////////////
 
     /**
-     * Value of the <code>ERA</code> field indicating
+     * Value of the {@code ERA} field indicating
      * the period before the common era (before Christ), also known as BCE.
-     * The sequence of years at the transition from <code>BC</code> to <code>AD</code> is
+     * The sequence of years at the transition from {@code BC} to {@code AD} is
      * ..., 2 BC, 1 BC, 1 AD, 2 AD,...
      *
      * @see #ERA
@@ -378,9 +378,9 @@
     static final int BCE = 0;
 
     /**
-     * Value of the <code>ERA</code> field indicating
+     * Value of the {@code ERA} field indicating
      * the common era (Anno Domini), also known as CE.
-     * The sequence of years at the transition from <code>BC</code> to <code>AD</code> is
+     * The sequence of years at the transition from {@code BC} to {@code AD} is
      * ..., 2 BC, 1 BC, 1 AD, 2 AD,...
      *
      * @see #ERA
@@ -585,7 +585,7 @@
 ///////////////
 
     /**
-     * Constructs a default <code>GregorianCalendar</code> using the current time
+     * Constructs a default {@code GregorianCalendar} using the current time
      * in the default time zone with the default
      * {@link Locale.Category#FORMAT FORMAT} locale.
      */
@@ -595,7 +595,7 @@
     }
 
     /**
-     * Constructs a <code>GregorianCalendar</code> based on the current time
+     * Constructs a {@code GregorianCalendar} based on the current time
      * in the given time zone with the default
      * {@link Locale.Category#FORMAT FORMAT} locale.
      *
@@ -606,7 +606,7 @@
     }
 
     /**
-     * Constructs a <code>GregorianCalendar</code> based on the current time
+     * Constructs a {@code GregorianCalendar} based on the current time
      * in the default time zone with the given locale.
      *
      * @param aLocale the given locale.
@@ -617,7 +617,7 @@
     }
 
     /**
-     * Constructs a <code>GregorianCalendar</code> based on the current time
+     * Constructs a {@code GregorianCalendar} based on the current time
      * in the given time zone with the given locale.
      *
      * @param zone the given time zone.
@@ -630,29 +630,29 @@
     }
 
     /**
-     * Constructs a <code>GregorianCalendar</code> with the given date set
+     * Constructs a {@code GregorianCalendar} with the given date set
      * in the default time zone with the default locale.
      *
-     * @param year the value used to set the <code>YEAR</code> calendar field in the calendar.
-     * @param month the value used to set the <code>MONTH</code> calendar field in the calendar.
+     * @param year the value used to set the {@code YEAR} calendar field in the calendar.
+     * @param month the value used to set the {@code MONTH} calendar field in the calendar.
      * Month value is 0-based. e.g., 0 for January.
-     * @param dayOfMonth the value used to set the <code>DAY_OF_MONTH</code> calendar field in the calendar.
+     * @param dayOfMonth the value used to set the {@code DAY_OF_MONTH} calendar field in the calendar.
      */
     public GregorianCalendar(int year, int month, int dayOfMonth) {
         this(year, month, dayOfMonth, 0, 0, 0, 0);
     }
 
     /**
-     * Constructs a <code>GregorianCalendar</code> with the given date
+     * Constructs a {@code GregorianCalendar} with the given date
      * and time set for the default time zone with the default locale.
      *
-     * @param year the value used to set the <code>YEAR</code> calendar field in the calendar.
-     * @param month the value used to set the <code>MONTH</code> calendar field in the calendar.
+     * @param year the value used to set the {@code YEAR} calendar field in the calendar.
+     * @param month the value used to set the {@code MONTH} calendar field in the calendar.
      * Month value is 0-based. e.g., 0 for January.
-     * @param dayOfMonth the value used to set the <code>DAY_OF_MONTH</code> calendar field in the calendar.
-     * @param hourOfDay the value used to set the <code>HOUR_OF_DAY</code> calendar field
+     * @param dayOfMonth the value used to set the {@code DAY_OF_MONTH} calendar field in the calendar.
+     * @param hourOfDay the value used to set the {@code HOUR_OF_DAY} calendar field
      * in the calendar.
-     * @param minute the value used to set the <code>MINUTE</code> calendar field
+     * @param minute the value used to set the {@code MINUTE} calendar field
      * in the calendar.
      */
     public GregorianCalendar(int year, int month, int dayOfMonth, int hourOfDay,
@@ -664,15 +664,15 @@
      * Constructs a GregorianCalendar with the given date
      * and time set for the default time zone with the default locale.
      *
-     * @param year the value used to set the <code>YEAR</code> calendar field in the calendar.
-     * @param month the value used to set the <code>MONTH</code> calendar field in the calendar.
+     * @param year the value used to set the {@code YEAR} calendar field in the calendar.
+     * @param month the value used to set the {@code MONTH} calendar field in the calendar.
      * Month value is 0-based. e.g., 0 for January.
-     * @param dayOfMonth the value used to set the <code>DAY_OF_MONTH</code> calendar field in the calendar.
-     * @param hourOfDay the value used to set the <code>HOUR_OF_DAY</code> calendar field
+     * @param dayOfMonth the value used to set the {@code DAY_OF_MONTH} calendar field in the calendar.
+     * @param hourOfDay the value used to set the {@code HOUR_OF_DAY} calendar field
      * in the calendar.
-     * @param minute the value used to set the <code>MINUTE</code> calendar field
+     * @param minute the value used to set the {@code MINUTE} calendar field
      * in the calendar.
-     * @param second the value used to set the <code>SECOND</code> calendar field
+     * @param second the value used to set the {@code SECOND} calendar field
      * in the calendar.
      */
     public GregorianCalendar(int year, int month, int dayOfMonth, int hourOfDay,
@@ -681,20 +681,20 @@
     }
 
     /**
-     * Constructs a <code>GregorianCalendar</code> with the given date
+     * Constructs a {@code GregorianCalendar} with the given date
      * and time set for the default time zone with the default locale.
      *
-     * @param year the value used to set the <code>YEAR</code> calendar field in the calendar.
-     * @param month the value used to set the <code>MONTH</code> calendar field in the calendar.
+     * @param year the value used to set the {@code YEAR} calendar field in the calendar.
+     * @param month the value used to set the {@code MONTH} calendar field in the calendar.
      * Month value is 0-based. e.g., 0 for January.
-     * @param dayOfMonth the value used to set the <code>DAY_OF_MONTH</code> calendar field in the calendar.
-     * @param hourOfDay the value used to set the <code>HOUR_OF_DAY</code> calendar field
+     * @param dayOfMonth the value used to set the {@code DAY_OF_MONTH} calendar field in the calendar.
+     * @param hourOfDay the value used to set the {@code HOUR_OF_DAY} calendar field
      * in the calendar.
-     * @param minute the value used to set the <code>MINUTE</code> calendar field
+     * @param minute the value used to set the {@code MINUTE} calendar field
      * in the calendar.
-     * @param second the value used to set the <code>SECOND</code> calendar field
+     * @param second the value used to set the {@code SECOND} calendar field
      * in the calendar.
-     * @param millis the value used to set the <code>MILLISECOND</code> calendar field
+     * @param millis the value used to set the {@code MILLISECOND} calendar field
      */
     GregorianCalendar(int year, int month, int dayOfMonth,
                       int hourOfDay, int minute, int second, int millis) {
@@ -745,13 +745,13 @@
 /////////////////
 
     /**
-     * Sets the <code>GregorianCalendar</code> change date. This is the point when the switch
+     * Sets the {@code GregorianCalendar} change date. This is the point when the switch
      * from Julian dates to Gregorian dates occurred. Default is October 15,
      * 1582 (Gregorian). Previous to this, dates will be in the Julian calendar.
      * <p>
      * To obtain a pure Julian calendar, set the change date to
-     * <code>Date(Long.MAX_VALUE)</code>.  To obtain a pure Gregorian calendar,
-     * set the change date to <code>Date(Long.MIN_VALUE)</code>.
+     * {@code Date(Long.MAX_VALUE)}.  To obtain a pure Gregorian calendar,
+     * set the change date to {@code Date(Long.MIN_VALUE)}.
      *
      * @param date the given Gregorian cutover date.
      */
@@ -803,20 +803,20 @@
      * October 15, 1582 (Gregorian). Previous to this, dates will be in the Julian
      * calendar.
      *
-     * @return the Gregorian cutover date for this <code>GregorianCalendar</code> object.
+     * @return the Gregorian cutover date for this {@code GregorianCalendar} object.
      */
     public final Date getGregorianChange() {
         return new Date(gregorianCutover);
     }
 
     /**
-     * Determines if the given year is a leap year. Returns <code>true</code> if
+     * Determines if the given year is a leap year. Returns {@code true} if
      * the given year is a leap year. To specify BC year numbers,
-     * <code>1 - year number</code> must be given. For example, year BC 4 is
+     * {@code 1 - year number} must be given. For example, year BC 4 is
      * specified as -3.
      *
      * @param year the given year.
-     * @return <code>true</code> if the given year is a leap year; <code>false</code> otherwise.
+     * @return {@code true} if the given year is a leap year; {@code false} otherwise.
      */
     public boolean isLeapYear(int year) {
         if ((year & 3) != 0) {
@@ -853,17 +853,17 @@
     }
 
     /**
-     * Compares this <code>GregorianCalendar</code> to the specified
-     * <code>Object</code>. The result is <code>true</code> if and
-     * only if the argument is a <code>GregorianCalendar</code> object
+     * Compares this {@code GregorianCalendar} to the specified
+     * {@code Object}. The result is {@code true} if and
+     * only if the argument is a {@code GregorianCalendar} object
      * that represents the same time value (millisecond offset from
      * the <a href="Calendar.html#Epoch">Epoch</a>) under the same
-     * <code>Calendar</code> parameters and Gregorian change date as
+     * {@code Calendar} parameters and Gregorian change date as
      * this object.
      *
      * @param obj the object to compare with.
-     * @return <code>true</code> if this object is equal to <code>obj</code>;
-     * <code>false</code> otherwise.
+     * @return {@code true} if this object is equal to {@code obj};
+     * {@code false} otherwise.
      * @see Calendar#compareTo(Calendar)
      */
     @Override
@@ -874,7 +874,7 @@
     }
 
     /**
-     * Generates the hash code for this <code>GregorianCalendar</code> object.
+     * Generates the hash code for this {@code GregorianCalendar} object.
      */
     @Override
     public int hashCode() {
@@ -885,27 +885,27 @@
      * Adds the specified (signed) amount of time to the given calendar field,
      * based on the calendar's rules.
      *
-     * <p><em>Add rule 1</em>. The value of <code>field</code>
-     * after the call minus the value of <code>field</code> before the
-     * call is <code>amount</code>, modulo any overflow that has occurred in
-     * <code>field</code>. Overflow occurs when a field value exceeds its
+     * <p><em>Add rule 1</em>. The value of {@code field}
+     * after the call minus the value of {@code field} before the
+     * call is {@code amount}, modulo any overflow that has occurred in
+     * {@code field}. Overflow occurs when a field value exceeds its
      * range and, as a result, the next larger field is incremented or
      * decremented and the field value is adjusted back into its range.</p>
      *
      * <p><em>Add rule 2</em>. If a smaller field is expected to be
      * invariant, but it is impossible for it to be equal to its
      * prior value because of changes in its minimum or maximum after
-     * <code>field</code> is changed, then its value is adjusted to be as close
+     * {@code field} is changed, then its value is adjusted to be as close
      * as possible to its expected value. A smaller field represents a
-     * smaller unit of time. <code>HOUR</code> is a smaller field than
-     * <code>DAY_OF_MONTH</code>. No adjustment is made to smaller fields
+     * smaller unit of time. {@code HOUR} is a smaller field than
+     * {@code DAY_OF_MONTH}. No adjustment is made to smaller fields
      * that are not expected to be invariant. The calendar system
      * determines what fields are expected to be invariant.</p>
      *
      * @param field the calendar field.
      * @param amount the amount of date or time to be added to the field.
-     * @throws    IllegalArgumentException if <code>field</code> is
-     * <code>ZONE_OFFSET</code>, <code>DST_OFFSET</code>, or unknown,
+     * @throws    IllegalArgumentException if {@code field} is
+     * {@code ZONE_OFFSET}, {@code DST_OFFSET}, or unknown,
      * or if any calendar fields have out-of-range values in
      * non-lenient mode.
      */
@@ -1094,15 +1094,15 @@
      * Adds or subtracts (up/down) a single unit of time on the given time
      * field without changing larger fields.
      * <p>
-     * <em>Example</em>: Consider a <code>GregorianCalendar</code>
+     * <em>Example</em>: Consider a {@code GregorianCalendar}
      * originally set to December 31, 1999. Calling {@link #roll(int,boolean) roll(Calendar.MONTH, true)}
-     * sets the calendar to January 31, 1999.  The <code>YEAR</code> field is unchanged
-     * because it is a larger field than <code>MONTH</code>.</p>
+     * sets the calendar to January 31, 1999.  The {@code YEAR} field is unchanged
+     * because it is a larger field than {@code MONTH}.</p>
      *
      * @param up indicates if the value of the specified calendar field is to be
-     * rolled up or rolled down. Use <code>true</code> if rolling up, <code>false</code> otherwise.
-     * @throws    IllegalArgumentException if <code>field</code> is
-     * <code>ZONE_OFFSET</code>, <code>DST_OFFSET</code>, or unknown,
+     * rolled up or rolled down. Use {@code true} if rolling up, {@code false} otherwise.
+     * @throws    IllegalArgumentException if {@code field} is
+     * {@code ZONE_OFFSET}, {@code DST_OFFSET}, or unknown,
      * or if any calendar fields have out-of-range values in
      * non-lenient mode.
      * @see #add(int,int)
@@ -1121,35 +1121,35 @@
      * <p>This method calls {@link #complete()} before adding the
      * amount so that all the calendar fields are normalized. If there
      * is any calendar field having an out-of-range value in non-lenient mode, then an
-     * <code>IllegalArgumentException</code> is thrown.
+     * {@code IllegalArgumentException} is thrown.
      *
      * <p>
-     * <em>Example</em>: Consider a <code>GregorianCalendar</code>
+     * <em>Example</em>: Consider a {@code GregorianCalendar}
      * originally set to August 31, 1999. Calling <code>roll(Calendar.MONTH,
      * 8)</code> sets the calendar to April 30, <strong>1999</strong>. Using a
-     * <code>GregorianCalendar</code>, the <code>DAY_OF_MONTH</code> field cannot
-     * be 31 in the month April. <code>DAY_OF_MONTH</code> is set to the closest possible
-     * value, 30. The <code>YEAR</code> field maintains the value of 1999 because it
-     * is a larger field than <code>MONTH</code>.
+     * {@code GregorianCalendar}, the {@code DAY_OF_MONTH} field cannot
+     * be 31 in the month April. {@code DAY_OF_MONTH} is set to the closest possible
+     * value, 30. The {@code YEAR} field maintains the value of 1999 because it
+     * is a larger field than {@code MONTH}.
      * <p>
-     * <em>Example</em>: Consider a <code>GregorianCalendar</code>
+     * <em>Example</em>: Consider a {@code GregorianCalendar}
      * originally set to Sunday June 6, 1999. Calling
-     * <code>roll(Calendar.WEEK_OF_MONTH, -1)</code> sets the calendar to
+     * {@code roll(Calendar.WEEK_OF_MONTH, -1)} sets the calendar to
      * Tuesday June 1, 1999, whereas calling
-     * <code>add(Calendar.WEEK_OF_MONTH, -1)</code> sets the calendar to
+     * {@code add(Calendar.WEEK_OF_MONTH, -1)} sets the calendar to
      * Sunday May 30, 1999. This is because the roll rule imposes an
-     * additional constraint: The <code>MONTH</code> must not change when the
-     * <code>WEEK_OF_MONTH</code> is rolled. Taken together with add rule 1,
+     * additional constraint: The {@code MONTH} must not change when the
+     * {@code WEEK_OF_MONTH} is rolled. Taken together with add rule 1,
      * the resultant date must be between Tuesday June 1 and Saturday June
-     * 5. According to add rule 2, the <code>DAY_OF_WEEK</code>, an invariant
-     * when changing the <code>WEEK_OF_MONTH</code>, is set to Tuesday, the
+     * 5. According to add rule 2, the {@code DAY_OF_WEEK}, an invariant
+     * when changing the {@code WEEK_OF_MONTH}, is set to Tuesday, the
      * closest possible value to Sunday (where Sunday is the first day of the
      * week).</p>
      *
      * @param field the calendar field.
-     * @param amount the signed amount to add to <code>field</code>.
-     * @throws    IllegalArgumentException if <code>field</code> is
-     * <code>ZONE_OFFSET</code>, <code>DST_OFFSET</code>, or unknown,
+     * @param amount the signed amount to add to {@code field}.
+     * @throws    IllegalArgumentException if {@code field} is
+     * {@code ZONE_OFFSET}, {@code DST_OFFSET}, or unknown,
      * or if any calendar fields have out-of-range values in
      * non-lenient mode.
      * @see #roll(int,boolean)
@@ -1512,7 +1512,7 @@
 
     /**
      * Returns the minimum value for the given calendar field of this
-     * <code>GregorianCalendar</code> instance. The minimum value is
+     * {@code GregorianCalendar} instance. The minimum value is
      * defined as the smallest value returned by the {@link
      * Calendar#get(int) get} method for any possible time value,
      * taking into consideration the current values of the
@@ -1536,7 +1536,7 @@
 
     /**
      * Returns the maximum value for the given calendar field of this
-     * <code>GregorianCalendar</code> instance. The maximum value is
+     * {@code GregorianCalendar} instance. The maximum value is
      * defined as the largest value returned by the {@link
      * Calendar#get(int) get} method for any possible time value,
      * taking into consideration the current values of the
@@ -1585,7 +1585,7 @@
 
     /**
      * Returns the highest minimum value for the given calendar field
-     * of this <code>GregorianCalendar</code> instance. The highest
+     * of this {@code GregorianCalendar} instance. The highest
      * minimum value is defined as the largest value returned by
      * {@link #getActualMinimum(int)} for any possible time value,
      * taking into consideration the current values of the
@@ -1615,7 +1615,7 @@
 
     /**
      * Returns the lowest maximum value for the given calendar field
-     * of this <code>GregorianCalendar</code> instance. The lowest
+     * of this {@code GregorianCalendar} instance. The lowest
      * maximum value is defined as the smallest value returned by
      * {@link #getActualMaximum(int)} for any possible time value,
      * taking into consideration the current values of the
@@ -1665,16 +1665,16 @@
      * {@link Calendar#getTimeZone() getTimeZone} methods.
      *
      * <p>For example, if the Gregorian change date is January 10,
-     * 1970 and the date of this <code>GregorianCalendar</code> is
+     * 1970 and the date of this {@code GregorianCalendar} is
      * January 20, 1970, the actual minimum value of the
-     * <code>DAY_OF_MONTH</code> field is 10 because the previous date
+     * {@code DAY_OF_MONTH} field is 10 because the previous date
      * of January 10, 1970 is December 27, 1996 (in the Julian
      * calendar). Therefore, December 28, 1969 to January 9, 1970
      * don't exist.
      *
      * @param field the calendar field
      * @return the minimum of the given field for the time value of
-     * this <code>GregorianCalendar</code>
+     * this {@code GregorianCalendar}
      * @see #getMinimum(int)
      * @see #getMaximum(int)
      * @see #getGreatestMinimum(int)
@@ -1705,7 +1705,7 @@
      * {@link #getGregorianChange() getGregorianChange} and
      * {@link Calendar#getTimeZone() getTimeZone} methods.
      * For example, if the date of this instance is February 1, 2004,
-     * the actual maximum value of the <code>DAY_OF_MONTH</code> field
+     * the actual maximum value of the {@code DAY_OF_MONTH} field
      * is 29 because 2004 is a leap year, and if the date of this
      * instance is February 1, 2005, it's 28.
      *
@@ -1718,7 +1718,7 @@
      *
      * @param field the calendar field
      * @return the maximum of the given field for the time value of
-     * this <code>GregorianCalendar</code>
+     * this {@code GregorianCalendar}
      * @see #getMinimum(int)
      * @see #getMaximum(int)
      * @see #getGreatestMinimum(int)
@@ -2287,7 +2287,7 @@
      * href="Calendar.html#Epoch">Epoch</a>) to calendar field values.
      * The time is <em>not</em>
      * recomputed first; to recompute the time, then the fields, call the
-     * <code>complete</code> method.
+     * {@code complete} method.
      *
      * @see Calendar#complete
      */
--- a/src/java.base/share/classes/java/util/IllformedLocaleException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/IllformedLocaleException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -47,7 +47,7 @@
     private int _errIdx = -1;
 
     /**
-     * Constructs a new <code>IllformedLocaleException</code> with no
+     * Constructs a new {@code IllformedLocaleException} with no
      * detail message and -1 as the error index.
      */
     public IllformedLocaleException() {
@@ -55,7 +55,7 @@
     }
 
     /**
-     * Constructs a new <code>IllformedLocaleException</code> with the
+     * Constructs a new {@code IllformedLocaleException} with the
      * given message and -1 as the error index.
      *
      * @param message the message
@@ -65,7 +65,7 @@
     }
 
     /**
-     * Constructs a new <code>IllformedLocaleException</code> with the
+     * Constructs a new {@code IllformedLocaleException} with the
      * given message and the error index.  The error index is the approximate
      * offset from the start of the ill-formed value to the point where the
      * parse first detected an error.  A negative error index value indicates
--- a/src/java.base/share/classes/java/util/ListResourceBundle.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/ListResourceBundle.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,16 +43,16 @@
 import sun.util.ResourceBundleEnumeration;
 
 /**
- * <code>ListResourceBundle</code> is an abstract subclass of
- * <code>ResourceBundle</code> that manages resources for a locale
- * in a convenient and easy to use list. See <code>ResourceBundle</code> for
+ * {@code ListResourceBundle} is an abstract subclass of
+ * {@code ResourceBundle} that manages resources for a locale
+ * in a convenient and easy to use list. See {@code ResourceBundle} for
  * more information about resource bundles in general.
  *
  * <P>
- * Subclasses must override <code>getContents</code> and provide an array,
+ * Subclasses must override {@code getContents} and provide an array,
  * where each item in the array is a pair of objects.
  * The first element of each pair is the key, which must be a
- * <code>String</code>, and the second element is the value associated with
+ * {@code String}, and the second element is the value associated with
  * that key.
  *
  * <p>
@@ -60,7 +60,7 @@
  * bundle family with the base name "MyResources".
  * "MyResources" is the default member of the bundle family, and
  * "MyResources_fr" is the French member.
- * These members are based on <code>ListResourceBundle</code>
+ * These members are based on {@code ListResourceBundle}
  * (a related <a href="PropertyResourceBundle.html#sample">example</a> shows
  * how you can add a bundle to this family that's based on a properties file).
  * The keys in this example are of the form "s1" etc. The actual
@@ -136,11 +136,11 @@
     }
 
     /**
-     * Returns an <code>Enumeration</code> of the keys contained in
-     * this <code>ResourceBundle</code> and its parent bundles.
+     * Returns an {@code Enumeration} of the keys contained in
+     * this {@code ResourceBundle} and its parent bundles.
      *
-     * @return an <code>Enumeration</code> of the keys contained in
-     *         this <code>ResourceBundle</code> and its parent bundles.
+     * @return an {@code Enumeration} of the keys contained in
+     *         this {@code ResourceBundle} and its parent bundles.
      * @see #keySet()
      */
     public Enumeration<String> getKeys() {
@@ -155,11 +155,11 @@
     }
 
     /**
-     * Returns a <code>Set</code> of the keys contained
-     * <em>only</em> in this <code>ResourceBundle</code>.
+     * Returns a {@code Set} of the keys contained
+     * <em>only</em> in this {@code ResourceBundle}.
      *
-     * @return a <code>Set</code> of the keys contained only in this
-     *         <code>ResourceBundle</code>
+     * @return a {@code Set} of the keys contained only in this
+     *         {@code ResourceBundle}
      * @since 1.6
      * @see #keySet()
      */
@@ -172,12 +172,12 @@
 
     /**
      * Returns an array in which each item is a pair of objects in an
-     * <code>Object</code> array. The first element of each pair is
-     * the key, which must be a <code>String</code>, and the second
+     * {@code Object} array. The first element of each pair is
+     * the key, which must be a {@code String}, and the second
      * element is the value associated with that key.  See the class
      * description for details.
      *
-     * @return an array of an <code>Object</code> array representing a
+     * @return an array of an {@code Object} array representing a
      * key-value pair.
      */
     protected abstract Object[][] getContents();
--- a/src/java.base/share/classes/java/util/Locale.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/Locale.java	Tue Sep 24 09:43:43 2019 +0100
@@ -66,9 +66,9 @@
 import sun.util.locale.provider.TimeZoneNameUtility;
 
 /**
- * A <code>Locale</code> object represents a specific geographical, political,
- * or cultural region. An operation that requires a <code>Locale</code> to perform
- * its task is called <em>locale-sensitive</em> and uses the <code>Locale</code>
+ * A {@code Locale} object represents a specific geographical, political,
+ * or cultural region. An operation that requires a {@code Locale} to perform
+ * its task is called <em>locale-sensitive</em> and uses the {@code Locale}
  * to tailor information for the user. For example, displaying a number
  * is a locale-sensitive operation&mdash; the number should be formatted
  * according to the customs and conventions of the user's native country,
@@ -81,7 +81,7 @@
  * Locale Data Markup Language") BCP 47-compatible extensions for locale data
  * exchange.
  *
- * <p> A <code>Locale</code> object logically consists of the fields
+ * <p> A {@code Locale} object logically consists of the fields
  * described below.
  *
  * <dl>
@@ -93,7 +93,7 @@
  *   alpha-2 code must be used.  You can find a full list of valid
  *   language codes in the IANA Language Subtag Registry (search for
  *   "Type: language").  The language field is case insensitive, but
- *   <code>Locale</code> always canonicalizes to lower case.</dd>
+ *   {@code Locale} always canonicalizes to lower case.</dd>
  *
  *   <dd>Well-formed language values have the form
  *   <code>[a-zA-Z]{2,8}</code>.  Note that this is not the full
@@ -108,7 +108,7 @@
  *   <dd>ISO 15924 alpha-4 script code.  You can find a full list of
  *   valid script codes in the IANA Language Subtag Registry (search
  *   for "Type: script").  The script field is case insensitive, but
- *   <code>Locale</code> always canonicalizes to title case (the first
+ *   {@code Locale} always canonicalizes to title case (the first
  *   letter is upper case and the rest of the letters are lower
  *   case).</dd>
  *
@@ -123,7 +123,7 @@
  *   You can find a full list of valid country and region codes in the
  *   IANA Language Subtag Registry (search for "Type: region").  The
  *   country (region) field is case insensitive, but
- *   <code>Locale</code> always canonicalizes to upper case.</dd>
+ *   {@code Locale} always canonicalizes to upper case.</dd>
  *
  *   <dd>Well-formed country/region values have
  *   the form <code>[a-zA-Z]{2} | [0-9]{3}</code></dd>
@@ -134,7 +134,7 @@
  *   <dt><a id="def_variant"><b>variant</b></a></dt>
  *
  *   <dd>Any arbitrary value used to indicate a variation of a
- *   <code>Locale</code>.  Where there are two or more variant values
+ *   {@code Locale}.  Where there are two or more variant values
  *   each indicating its own semantics, these values should be ordered
  *   by importance, with most important first, separated by
  *   underscore('_').  The variant field is case sensitive.</dd>
@@ -146,7 +146,7 @@
  *   region subtags.  You can find a full list of valid variant codes
  *   in the IANA Language Subtag Registry (search for "Type: variant").
  *
- *   <p>However, the variant field in <code>Locale</code> has
+ *   <p>However, the variant field in {@code Locale} has
  *   historically been used for any kind of variation, not just
  *   language variations.  For example, some supported variants
  *   available in Java SE Runtime Environments indicate alternative
@@ -166,15 +166,15 @@
  *
  *   <dd>A map from single character keys to string values, indicating
  *   extensions apart from language identification.  The extensions in
- *   <code>Locale</code> implement the semantics and syntax of BCP 47
+ *   {@code Locale} implement the semantics and syntax of BCP 47
  *   extension subtags and private use subtags. The extensions are
- *   case insensitive, but <code>Locale</code> canonicalizes all
+ *   case insensitive, but {@code Locale} canonicalizes all
  *   extension keys and values to lower case. Note that extensions
  *   cannot have empty values.</dd>
  *
  *   <dd>Well-formed keys are single characters from the set
- *   <code>[0-9a-zA-Z]</code>.  Well-formed values have the form
- *   <code>SUBTAG ('-' SUBTAG)*</code> where for the key 'x'
+ *   {@code [0-9a-zA-Z]}.  Well-formed values have the form
+ *   {@code SUBTAG ('-' SUBTAG)*} where for the key 'x'
  *   <code>SUBTAG = [0-9a-zA-Z]{1,8}</code> and for other keys
  *   <code>SUBTAG = [0-9a-zA-Z]{2,8}</code> (that is, 'x' allows
  *   single-character subtags).</dd>
@@ -184,8 +184,8 @@
  * </dl>
  *
  * <b>Note:</b> Although BCP 47 requires field values to be registered
- * in the IANA Language Subtag Registry, the <code>Locale</code> class
- * does not provide any validation features.  The <code>Builder</code>
+ * in the IANA Language Subtag Registry, the {@code Locale} class
+ * does not provide any validation features.  The {@code Builder}
  * only checks if an individual field satisfies the syntactic
  * requirement (is well-formed), but does not validate the value
  * itself.  See {@link Builder} for details.
@@ -203,11 +203,11 @@
  * extension key 'u' ({@link #UNICODE_LOCALE_EXTENSION}).  The above
  * example, "nu-thai", becomes the extension "u-nu-thai".
  *
- * <p>Thus, when a <code>Locale</code> object contains Unicode locale
+ * <p>Thus, when a {@code Locale} object contains Unicode locale
  * attributes and keywords,
- * <code>getExtension(UNICODE_LOCALE_EXTENSION)</code> will return a
+ * {@code getExtension(UNICODE_LOCALE_EXTENSION)} will return a
  * String representing this information, for example, "nu-thai".  The
- * <code>Locale</code> class also provides {@link
+ * {@code Locale} class also provides {@link
  * #getUnicodeLocaleAttributes}, {@link #getUnicodeLocaleKeys}, and
  * {@link #getUnicodeLocaleType} which allow you to access Unicode
  * locale attributes and key/type pairs directly.  When represented as
@@ -232,17 +232,17 @@
  *
  * <h3>Creating a Locale</h3>
  *
- * <p>There are several different ways to create a <code>Locale</code>
+ * <p>There are several different ways to create a {@code Locale}
  * object.
  *
  * <h4>Builder</h4>
  *
- * <p>Using {@link Builder} you can construct a <code>Locale</code> object
+ * <p>Using {@link Builder} you can construct a {@code Locale} object
  * that conforms to BCP 47 syntax.
  *
  * <h4>Constructors</h4>
  *
- * <p>The <code>Locale</code> class provides three constructors:
+ * <p>The {@code Locale} class provides three constructors:
  * <blockquote>
  * <pre>
  *     {@link #Locale(String language)}
@@ -250,20 +250,20 @@
  *     {@link #Locale(String language, String country, String variant)}
  * </pre>
  * </blockquote>
- * These constructors allow you to create a <code>Locale</code> object
+ * These constructors allow you to create a {@code Locale} object
  * with language, country and variant, but you cannot specify
  * script or extensions.
  *
  * <h4>Factory Methods</h4>
  *
- * <p>The method {@link #forLanguageTag} creates a <code>Locale</code>
+ * <p>The method {@link #forLanguageTag} creates a {@code Locale}
  * object for a well-formed BCP 47 language tag.
  *
  * <h4>Locale Constants</h4>
  *
- * <p>The <code>Locale</code> class provides a number of convenient constants
- * that you can use to create <code>Locale</code> objects for commonly used
- * locales. For example, the following creates a <code>Locale</code> object
+ * <p>The {@code Locale} class provides a number of convenient constants
+ * that you can use to create {@code Locale} objects for commonly used
+ * locales. For example, the following creates a {@code Locale} object
  * for the United States:
  * <blockquote>
  * <pre>
@@ -344,25 +344,25 @@
  *
  * <h3>Use of Locale</h3>
  *
- * <p>Once you've created a <code>Locale</code> you can query it for information
- * about itself. Use <code>getCountry</code> to get the country (or region)
- * code and <code>getLanguage</code> to get the language code.
- * You can use <code>getDisplayCountry</code> to get the
+ * <p>Once you've created a {@code Locale} you can query it for information
+ * about itself. Use {@code getCountry} to get the country (or region)
+ * code and {@code getLanguage} to get the language code.
+ * You can use {@code getDisplayCountry} to get the
  * name of the country suitable for displaying to the user. Similarly,
- * you can use <code>getDisplayLanguage</code> to get the name of
+ * you can use {@code getDisplayLanguage} to get the name of
  * the language suitable for displaying to the user. Interestingly,
- * the <code>getDisplayXXX</code> methods are themselves locale-sensitive
+ * the {@code getDisplayXXX} methods are themselves locale-sensitive
  * and have two versions: one that uses the default
  * {@link Locale.Category#DISPLAY DISPLAY} locale and one
  * that uses the locale specified as an argument.
  *
  * <p>The Java Platform provides a number of classes that perform locale-sensitive
- * operations. For example, the <code>NumberFormat</code> class formats
+ * operations. For example, the {@code NumberFormat} class formats
  * numbers, currency, and percentages in a locale-sensitive manner. Classes
- * such as <code>NumberFormat</code> have several convenience methods
+ * such as {@code NumberFormat} have several convenience methods
  * for creating a default object of that type. For example, the
- * <code>NumberFormat</code> class provides these three convenience methods
- * for creating a default <code>NumberFormat</code> object:
+ * {@code NumberFormat} class provides these three convenience methods
+ * for creating a default {@code NumberFormat} object:
  * <blockquote>
  * <pre>
  *     NumberFormat.getInstance()
@@ -380,8 +380,8 @@
  *     NumberFormat.getPercentInstance(myLocale)
  * </pre>
  * </blockquote>
- * A <code>Locale</code> is the mechanism for identifying the kind of object
- * (<code>NumberFormat</code>) that you would like to get. The locale is
+ * A {@code Locale} is the mechanism for identifying the kind of object
+ * ({@code NumberFormat}) that you would like to get. The locale is
  * <STRONG>just</STRONG> a mechanism for identifying objects,
  * <STRONG>not</STRONG> a container for the objects themselves.
  *
@@ -390,7 +390,7 @@
  * <p>In order to maintain compatibility with existing usage, Locale's
  * constructors retain their behavior prior to the Java Runtime
  * Environment version 1.7.  The same is largely true for the
- * <code>toString</code> method. Thus Locale objects can continue to
+ * {@code toString} method. Thus Locale objects can continue to
  * be used as they were. In particular, clients who parse the output
  * of toString into language, country, and variant fields can continue
  * to do so (although this is strongly discouraged), although the
@@ -400,15 +400,15 @@
  * <p>In addition, BCP 47 imposes syntax restrictions that are not
  * imposed by Locale's constructors. This means that conversions
  * between some Locales and BCP 47 language tags cannot be made without
- * losing information. Thus <code>toLanguageTag</code> cannot
+ * losing information. Thus {@code toLanguageTag} cannot
  * represent the state of locales whose language, country, or variant
  * do not conform to BCP 47.
  *
  * <p>Because of these issues, it is recommended that clients migrate
  * away from constructing non-conforming locales and use the
- * <code>forLanguageTag</code> and <code>Locale.Builder</code> APIs instead.
+ * {@code forLanguageTag} and {@code Locale.Builder} APIs instead.
  * Clients desiring a string representation of the complete locale can
- * then always rely on <code>toLanguageTag</code> for this purpose.
+ * then always rely on {@code toLanguageTag} for this purpose.
  *
  * <h4><a id="special_cases_constructor">Special cases</a></h4>
  *
@@ -454,9 +454,9 @@
  *
  * <p>The APIs added in 1.7 map between the old and new language codes,
  * maintaining the old codes internal to Locale (so that
- * <code>getLanguage</code> and <code>toString</code> reflect the old
+ * {@code getLanguage} and {@code toString} reflect the old
  * code), but using the new codes in the BCP 47 language tag APIs (so
- * that <code>toLanguageTag</code> reflects the new one). This
+ * that {@code toLanguageTag} reflects the new one). This
  * preserves the equivalence between Locales no matter which code or
  * API is used to construct them. Java's default resource bundle
  * lookup mechanism also implements this mapping, so that resources
@@ -734,12 +734,12 @@
      * </ul>
      *
      * @param language An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
-     * up to 8 characters in length.  See the <code>Locale</code> class description about
+     * up to 8 characters in length.  See the {@code Locale} class description about
      * valid language values.
      * @param country An ISO 3166 alpha-2 country code or a UN M.49 numeric-3 area code.
-     * See the <code>Locale</code> class description about valid country values.
-     * @param variant Any arbitrary value used to indicate a variation of a <code>Locale</code>.
-     * See the <code>Locale</code> class description for the details.
+     * See the {@code Locale} class description about valid country values.
+     * @param variant Any arbitrary value used to indicate a variation of a {@code Locale}.
+     * See the {@code Locale} class description for the details.
      * @throws    NullPointerException thrown if any argument is null.
      */
     public Locale(String language, String country, String variant) {
@@ -766,10 +766,10 @@
      * </ul>
      *
      * @param language An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
-     * up to 8 characters in length.  See the <code>Locale</code> class description about
+     * up to 8 characters in length.  See the {@code Locale} class description about
      * valid language values.
      * @param country An ISO 3166 alpha-2 country code or a UN M.49 numeric-3 area code.
-     * See the <code>Locale</code> class description about valid country values.
+     * See the {@code Locale} class description about valid country values.
      * @throws    NullPointerException thrown if either argument is null.
      */
     public Locale(String language, String country) {
@@ -791,7 +791,7 @@
      * </ul>
      *
      * @param language An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
-     * up to 8 characters in length.  See the <code>Locale</code> class description about
+     * up to 8 characters in length.  See the {@code Locale} class description about
      * valid language values.
      * @throws    NullPointerException thrown if argument is null.
      * @since 1.4
@@ -801,17 +801,17 @@
     }
 
     /**
-     * Returns a <code>Locale</code> constructed from the given
-     * <code>language</code>, <code>country</code> and
-     * <code>variant</code>. If the same <code>Locale</code> instance
+     * Returns a {@code Locale} constructed from the given
+     * {@code language}, {@code country} and
+     * {@code variant}. If the same {@code Locale} instance
      * is available in the cache, then that instance is
-     * returned. Otherwise, a new <code>Locale</code> instance is
+     * returned. Otherwise, a new {@code Locale} instance is
      * created and cached.
      *
      * @param language lowercase 2 to 8 language code.
      * @param country uppercase two-letter ISO-3166 code and numeric-3 UN M.49 area code.
      * @param variant vendor and browser specific code. See class description.
-     * @return the <code>Locale</code> instance requested
+     * @return the {@code Locale} instance requested
      * @throws    NullPointerException if any argument is null.
      */
     static Locale getInstance(String language, String country, String variant) {
@@ -1029,8 +1029,8 @@
      * Sets the default locale for this instance of the Java Virtual Machine.
      * This does not affect the host locale.
      * <p>
-     * If there is a security manager, its <code>checkPermission</code>
-     * method is called with a <code>PropertyPermission("user.language", "write")</code>
+     * If there is a security manager, its {@code checkPermission}
+     * method is called with a {@code PropertyPermission("user.language", "write")}
      * permission before the default locale is changed.
      * <p>
      * The Java Virtual Machine sets the default locale during startup
@@ -1047,8 +1047,8 @@
      *
      * @throws SecurityException
      *        if a security manager exists and its
-     *        <code>checkPermission</code> method doesn't allow the operation.
-     * @throws NullPointerException if <code>newLocale</code> is null
+     *        {@code checkPermission} method doesn't allow the operation.
+     * @throws NullPointerException if {@code newLocale} is null
      * @param newLocale the new default locale
      * @see SecurityManager#checkPermission
      * @see java.util.PropertyPermission
@@ -1113,7 +1113,7 @@
      * The returned array represents the union of locales supported
      * by the Java runtime environment and by installed
      * {@link java.util.spi.LocaleServiceProvider LocaleServiceProvider}
-     * implementations.  It must contain at least a <code>Locale</code>
+     * implementations.  It must contain at least a {@code Locale}
      * instance equal to {@link java.util.Locale#US Locale.US}.
      *
      * @return An array of installed locales.
@@ -1128,7 +1128,7 @@
      * This method is equivalent to {@link #getISOCountries(Locale.IsoCountryCode type)}
      * with {@code type}  {@link IsoCountryCode#PART1_ALPHA2}.
      * <p>
-     * <b>Note:</b> The <code>Locale</code> class also supports other codes for
+     * <b>Note:</b> The {@code Locale} class also supports other codes for
      * country (region), such as 3-letter numeric UN M.49 area codes.
      * Therefore, the list returned by this method does not contain ALL valid
      * codes that can be used to create Locales.
@@ -1171,7 +1171,7 @@
      * <li>ISO 639 is not a stable standard&mdash; some languages' codes have changed.
      * The list this function returns includes both the new and the old codes for the
      * languages whose codes have changed.
-     * <li>The <code>Locale</code> class also supports language codes up to
+     * <li>The {@code Locale} class also supports language codes up to
      * 8 characters in length.  Therefore, the list returned by this method does
      * not contain ALL valid codes that can be used to create Locales.
      * </ul>
@@ -1283,7 +1283,7 @@
      * Returns the extension (or private use) value associated with
      * the specified key, or null if there is no extension
      * associated with the key. To be well-formed, the key must be one
-     * of <code>[0-9A-Za-z]</code>. Keys are case-insensitive, so
+     * of {@code [0-9A-Za-z]}. Keys are case-insensitive, so
      * for example 'z' and 'Z' represent the same extension.
      *
      * @param key the extension key
@@ -1343,7 +1343,7 @@
      * @return The Unicode locale type associated with the key, or null if the
      * locale does not define the key.
      * @throws IllegalArgumentException if the key is not well-formed
-     * @throws NullPointerException if <code>key</code> is null
+     * @throws NullPointerException if {@code key} is null
      * @since 1.7
      */
     public String getUnicodeLocaleType(String key) {
@@ -1388,7 +1388,7 @@
      }
 
     /**
-     * Returns a string representation of this <code>Locale</code>
+     * Returns a string representation of this {@code Locale}
      * object, consisting of language, country, variant, script,
      * and extensions as below:
      * <blockquote>
@@ -1411,7 +1411,7 @@
      * added before the "#".
      *
      * <p>This behavior is designed to support debugging and to be compatible with
-     * previous uses of <code>toString</code> that expected language, country, and variant
+     * previous uses of {@code toString} that expected language, country, and variant
      * fields only.  To represent a Locale as a String for interchange purposes, use
      * {@link #toLanguageTag}.
      *
@@ -1467,7 +1467,7 @@
      * Returns a well-formed IETF BCP 47 language tag representing
      * this locale.
      *
-     * <p>If this <code>Locale</code> has a language, country, or
+     * <p>If this {@code Locale} has a language, country, or
      * variant that does not satisfy the IETF BCP 47 language tag
      * syntax requirements, this method handles these fields as
      * described below:
@@ -1703,12 +1703,12 @@
      * <p>For a list of all grandfathered tags, see the
      * IANA Language Subtag Registry (search for "Type: grandfathered").
      *
-     * <p><b>Note</b>: there is no guarantee that <code>toLanguageTag</code>
-     * and <code>forLanguageTag</code> will round-trip.
+     * <p><b>Note</b>: there is no guarantee that {@code toLanguageTag}
+     * and {@code forLanguageTag} will round-trip.
      *
      * @param languageTag the language tag
      * @return The locale that best represents the language tag.
-     * @throws NullPointerException if <code>languageTag</code> is <code>null</code>
+     * @throws NullPointerException if {@code languageTag} is {@code null}
      * @see #toLanguageTag()
      * @see java.util.Locale.Builder#setLanguageTag(String)
      * @since 1.7
@@ -1834,7 +1834,7 @@
      *
      * @param inLocale The locale for which to retrieve the display language.
      * @return The name of the display language appropriate to the given locale.
-     * @throws    NullPointerException if <code>inLocale</code> is <code>null</code>
+     * @throws    NullPointerException if {@code inLocale} is {@code null}
      */
     public String getDisplayLanguage(Locale inLocale) {
         return getDisplayString(baseLocale.getLanguage(), null, inLocale, DISPLAY_LANGUAGE);
@@ -1863,7 +1863,7 @@
      * @param inLocale The locale for which to retrieve the display script.
      * @return the display name of the script code for the current default
      * {@link Locale.Category#DISPLAY DISPLAY} locale
-     * @throws NullPointerException if <code>inLocale</code> is <code>null</code>
+     * @throws NullPointerException if {@code inLocale} is {@code null}
      * @since 1.7
      */
     public String getDisplayScript(Locale inLocale) {
@@ -1907,7 +1907,7 @@
      *
      * @param inLocale The locale for which to retrieve the display country.
      * @return The name of the country appropriate to the given locale.
-     * @throws    NullPointerException if <code>inLocale</code> is <code>null</code>
+     * @throws    NullPointerException if {@code inLocale} is {@code null}
      */
     public String getDisplayCountry(Locale inLocale) {
         return getDisplayString(baseLocale.getRegion(), null, inLocale, DISPLAY_COUNTRY);
@@ -1949,7 +1949,7 @@
      *
      * @param inLocale The locale for which to retrieve the display variant code.
      * @return The name of the display variant code appropriate to the given locale.
-     * @throws    NullPointerException if <code>inLocale</code> is <code>null</code>
+     * @throws    NullPointerException if {@code inLocale} is {@code null}
      */
     public String getDisplayVariant(Locale inLocale) {
         if (baseLocale.getVariant().isEmpty())
@@ -2014,7 +2014,7 @@
      *
      * @param inLocale The locale for which to retrieve the display name.
      * @return The name of the locale appropriate to display.
-     * @throws NullPointerException if <code>inLocale</code> is <code>null</code>
+     * @throws NullPointerException if {@code inLocale} is {@code null}
      */
     public String getDisplayName(Locale inLocale) {
         LocaleResources lr =  LocaleProviderAdapter
@@ -2313,8 +2313,8 @@
     };
 
     /**
-     * Serializes this <code>Locale</code> to the specified <code>ObjectOutputStream</code>.
-     * @param out the <code>ObjectOutputStream</code> to write
+     * Serializes this {@code Locale} to the specified {@code ObjectOutputStream}.
+     * @param out the {@code ObjectOutputStream} to write
      * @throws IOException
      * @since 1.7
      */
@@ -2331,8 +2331,8 @@
     }
 
     /**
-     * Deserializes this <code>Locale</code>.
-     * @param in the <code>ObjectInputStream</code> to read
+     * Deserializes this {@code Locale}.
+     * @param in the {@code ObjectInputStream} to read
      * @throws IOException
      * @throws ClassNotFoundException
      * @throws IllformedLocaleException
@@ -2362,17 +2362,17 @@
     }
 
     /**
-     * Returns a cached <code>Locale</code> instance equivalent to
-     * the deserialized <code>Locale</code>. When serialized
+     * Returns a cached {@code Locale} instance equivalent to
+     * the deserialized {@code Locale}. When serialized
      * language, country and variant fields read from the object data stream
      * are exactly "ja", "JP", "JP" or "th", "TH", "TH" and script/extensions
-     * fields are empty, this method supplies <code>UNICODE_LOCALE_EXTENSION</code>
+     * fields are empty, this method supplies {@code UNICODE_LOCALE_EXTENSION}
      * "ca"/"japanese" (calendar type is "japanese") or "nu"/"thai" (number script
      * type is "thai"). See <a href="Locale.html#special_cases_constructor">Special Cases</a>
      * for more information.
      *
-     * @return an instance of <code>Locale</code> equivalent to
-     * the deserialized <code>Locale</code>.
+     * @return an instance of {@code Locale} equivalent to
+     * the deserialized {@code Locale}.
      * @throws java.io.ObjectStreamException
      */
     @java.io.Serial
@@ -2509,33 +2509,33 @@
     }
 
     /**
-     * <code>Builder</code> is used to build instances of <code>Locale</code>
-     * from values configured by the setters.  Unlike the <code>Locale</code>
-     * constructors, the <code>Builder</code> checks if a value configured by a
-     * setter satisfies the syntax requirements defined by the <code>Locale</code>
-     * class.  A <code>Locale</code> object created by a <code>Builder</code> is
+     * {@code Builder} is used to build instances of {@code Locale}
+     * from values configured by the setters.  Unlike the {@code Locale}
+     * constructors, the {@code Builder} checks if a value configured by a
+     * setter satisfies the syntax requirements defined by the {@code Locale}
+     * class.  A {@code Locale} object created by a {@code Builder} is
      * well-formed and can be transformed to a well-formed IETF BCP 47 language tag
      * without losing information.
      *
-     * <p><b>Note:</b> The <code>Locale</code> class does not provide any
+     * <p><b>Note:</b> The {@code Locale} class does not provide any
      * syntactic restrictions on variant, while BCP 47 requires each variant
      * subtag to be 5 to 8 alphanumerics or a single numeric followed by 3
-     * alphanumerics.  The method <code>setVariant</code> throws
-     * <code>IllformedLocaleException</code> for a variant that does not satisfy
+     * alphanumerics.  The method {@code setVariant} throws
+     * {@code IllformedLocaleException} for a variant that does not satisfy
      * this restriction. If it is necessary to support such a variant, use a
-     * Locale constructor.  However, keep in mind that a <code>Locale</code>
+     * Locale constructor.  However, keep in mind that a {@code Locale}
      * object created this way might lose the variant information when
      * transformed to a BCP 47 language tag.
      *
-     * <p>The following example shows how to create a <code>Locale</code> object
-     * with the <code>Builder</code>.
+     * <p>The following example shows how to create a {@code Locale} object
+     * with the {@code Builder}.
      * <blockquote>
      * <pre>
      *     Locale aLocale = new Builder().setLanguage("sr").setScript("Latn").setRegion("RS").build();
      * </pre>
      * </blockquote>
      *
-     * <p>Builders can be reused; <code>clear()</code> resets all
+     * <p>Builders can be reused; {@code clear()} resets all
      * fields to their default values.
      *
      * @see Locale#forLanguageTag
@@ -2554,13 +2554,13 @@
         }
 
         /**
-         * Resets the <code>Builder</code> to match the provided
-         * <code>locale</code>.  Existing state is discarded.
+         * Resets the {@code Builder} to match the provided
+         * {@code locale}.  Existing state is discarded.
          *
          * <p>All fields of the locale must be well-formed, see {@link Locale}.
          *
          * <p>Locales with any ill-formed fields cause
-         * <code>IllformedLocaleException</code> to be thrown, except for the
+         * {@code IllformedLocaleException} to be thrown, except for the
          * following three cases which are accepted for compatibility
          * reasons:<ul>
          * <li>Locale("ja", "JP", "JP") is treated as "ja-JP-u-ca-japanese"
@@ -2569,9 +2569,9 @@
          *
          * @param locale the locale
          * @return This builder.
-         * @throws IllformedLocaleException if <code>locale</code> has
+         * @throws IllformedLocaleException if {@code locale} has
          * any ill-formed fields.
-         * @throws NullPointerException if <code>locale</code> is null.
+         * @throws NullPointerException if {@code locale} is null.
          */
         public Builder setLocale(Locale locale) {
             try {
@@ -2590,13 +2590,13 @@
          * Locale#forLanguageTag}) are converted to their canonical
          * form before being processed.  Otherwise, the language tag
          * must be well-formed (see {@link Locale}) or an exception is
-         * thrown (unlike <code>Locale.forLanguageTag</code>, which
+         * thrown (unlike {@code Locale.forLanguageTag}, which
          * just discards ill-formed and following portions of the
          * tag).
          *
          * @param languageTag the language tag
          * @return This builder.
-         * @throws IllformedLocaleException if <code>languageTag</code> is ill-formed
+         * @throws IllformedLocaleException if {@code languageTag} is ill-formed
          * @see Locale#forLanguageTag(String)
          */
         public Builder setLanguageTag(String languageTag) {
@@ -2610,8 +2610,8 @@
         }
 
         /**
-         * Sets the language.  If <code>language</code> is the empty string or
-         * null, the language in this <code>Builder</code> is removed.  Otherwise,
+         * Sets the language.  If {@code language} is the empty string or
+         * null, the language in this {@code Builder} is removed.  Otherwise,
          * the language must be <a href="./Locale.html#def_language">well-formed</a>
          * or an exception is thrown.
          *
@@ -2620,7 +2620,7 @@
          *
          * @param language the language
          * @return This builder.
-         * @throws IllformedLocaleException if <code>language</code> is ill-formed
+         * @throws IllformedLocaleException if {@code language} is ill-formed
          */
         public Builder setLanguage(String language) {
             try {
@@ -2632,8 +2632,8 @@
         }
 
         /**
-         * Sets the script. If <code>script</code> is null or the empty string,
-         * the script in this <code>Builder</code> is removed.
+         * Sets the script. If {@code script} is null or the empty string,
+         * the script in this {@code Builder} is removed.
          * Otherwise, the script must be <a href="./Locale.html#def_script">well-formed</a> or an
          * exception is thrown.
          *
@@ -2641,7 +2641,7 @@
          *
          * @param script the script
          * @return This builder.
-         * @throws IllformedLocaleException if <code>script</code> is ill-formed
+         * @throws IllformedLocaleException if {@code script} is ill-formed
          */
         public Builder setScript(String script) {
             try {
@@ -2654,19 +2654,19 @@
 
         /**
          * Sets the region.  If region is null or the empty string, the region
-         * in this <code>Builder</code> is removed.  Otherwise,
+         * in this {@code Builder} is removed.  Otherwise,
          * the region must be <a href="./Locale.html#def_region">well-formed</a> or an
          * exception is thrown.
          *
          * <p>The typical region value is a two-letter ISO 3166 code or a
          * three-digit UN M.49 area code.
          *
-         * <p>The country value in the <code>Locale</code> created by the
-         * <code>Builder</code> is always normalized to upper case.
+         * <p>The country value in the {@code Locale} created by the
+         * {@code Builder} is always normalized to upper case.
          *
          * @param region the region
          * @return This builder.
-         * @throws IllformedLocaleException if <code>region</code> is ill-formed
+         * @throws IllformedLocaleException if {@code region} is ill-formed
          */
         public Builder setRegion(String region) {
             try {
@@ -2679,21 +2679,21 @@
 
         /**
          * Sets the variant.  If variant is null or the empty string, the
-         * variant in this <code>Builder</code> is removed.  Otherwise, it
+         * variant in this {@code Builder} is removed.  Otherwise, it
          * must consist of one or more <a href="./Locale.html#def_variant">well-formed</a>
          * subtags, or an exception is thrown.
          *
-         * <p><b>Note:</b> This method checks if <code>variant</code>
+         * <p><b>Note:</b> This method checks if {@code variant}
          * satisfies the IETF BCP 47 variant subtag's syntax requirements,
          * and normalizes the value to lowercase letters.  However,
-         * the <code>Locale</code> class does not impose any syntactic
+         * the {@code Locale} class does not impose any syntactic
          * restriction on variant, and the variant value in
-         * <code>Locale</code> is case sensitive.  To set such a variant,
+         * {@code Locale} is case sensitive.  To set such a variant,
          * use a Locale constructor.
          *
          * @param variant the variant
          * @return This builder.
-         * @throws IllformedLocaleException if <code>variant</code> is ill-formed
+         * @throws IllformedLocaleException if {@code variant} is ill-formed
          */
         public Builder setVariant(String variant) {
             try {
@@ -2723,8 +2723,8 @@
          * @param key the extension key
          * @param value the extension value
          * @return This builder.
-         * @throws IllformedLocaleException if <code>key</code> is illegal
-         * or <code>value</code> is ill-formed
+         * @throws IllformedLocaleException if {@code key} is illegal
+         * or {@code value} is ill-formed
          * @see #setUnicodeLocaleKeyword(String, String)
          */
         public Builder setExtension(char key, String value) {
@@ -2752,9 +2752,9 @@
          * @param key the Unicode locale key
          * @param type the Unicode locale type
          * @return This builder.
-         * @throws IllformedLocaleException if <code>key</code> or <code>type</code>
+         * @throws IllformedLocaleException if {@code key} or {@code type}
          * is ill-formed
-         * @throws NullPointerException if <code>key</code> is null
+         * @throws NullPointerException if {@code key} is null
          * @see #setExtension(char, String)
          */
         public Builder setUnicodeLocaleKeyword(String key, String type) {
@@ -2774,8 +2774,8 @@
          *
          * @param attribute the attribute
          * @return This builder.
-         * @throws NullPointerException if <code>attribute</code> is null
-         * @throws IllformedLocaleException if <code>attribute</code> is ill-formed
+         * @throws NullPointerException if {@code attribute} is null
+         * @throws IllformedLocaleException if {@code attribute} is ill-formed
          * @see #setExtension(char, String)
          */
         public Builder addUnicodeLocaleAttribute(String attribute) {
@@ -2797,8 +2797,8 @@
          *
          * @param attribute the attribute
          * @return This builder.
-         * @throws NullPointerException if <code>attribute</code> is null
-         * @throws IllformedLocaleException if <code>attribute</code> is ill-formed
+         * @throws NullPointerException if {@code attribute} is null
+         * @throws IllformedLocaleException if {@code attribute} is ill-formed
          * @see #setExtension(char, String)
          */
         public Builder removeUnicodeLocaleAttribute(String attribute) {
@@ -2834,7 +2834,7 @@
         }
 
         /**
-         * Returns an instance of <code>Locale</code> created from the fields set
+         * Returns an instance of {@code Locale} created from the fields set
          * on this builder.
          *
          * <p>This applies the conversions listed in {@link Locale#forLanguageTag}
@@ -3482,7 +3482,7 @@
      * @param priorityList user's Language Priority List in which each language
      *     tag is sorted in descending order based on priority or weight
      * @param locales {@code Locale} instances used for matching
-     * @return the best matching <code>Locale</code> instance chosen based on
+     * @return the best matching {@code Locale} instance chosen based on
      *     priority or weight, or {@code null} if nothing matches.
      * @throws NullPointerException if {@code priorityList} or {@code tags} is
      *     {@code null}
--- a/src/java.base/share/classes/java/util/PropertyPermission.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/PropertyPermission.java	Tue Sep 24 09:43:43 2019 +0100
@@ -54,10 +54,10 @@
  *
  * <DL>
  *    <DT> read
- *    <DD> read permission. Allows <code>System.getProperty</code> to
+ *    <DD> read permission. Allows {@code System.getProperty} to
  *         be called.
  *    <DT> write
- *    <DD> write permission. Allows <code>System.setProperty</code> to
+ *    <DD> write permission. Allows {@code System.setProperty} to
  *         be called.
  * </DL>
  * <P>
@@ -149,9 +149,9 @@
      * @param name the name of the PropertyPermission.
      * @param actions the actions string.
      *
-     * @throws NullPointerException if <code>name</code> is <code>null</code>.
-     * @throws IllegalArgumentException if <code>name</code> is empty or if
-     * <code>actions</code> is invalid.
+     * @throws NullPointerException if {@code name} is {@code null}.
+     * @throws IllegalArgumentException if {@code name} is empty or if
+     * {@code actions} is invalid.
      */
     public PropertyPermission(String name, String actions) {
         super(name,actions);
@@ -223,7 +223,7 @@
     /**
      * Returns the hash code value for this object.
      * The hash code used is the hash code of this permissions name, that is,
-     * <code>getName().hashCode()</code>, where <code>getName</code> is
+     * {@code getName().hashCode()}, where {@code getName} is
      * from the Permission superclass.
      *
      * @return a hash code value for this object.
@@ -350,7 +350,7 @@
      * Returns the "canonical string representation" of the actions.
      * That is, this method always returns present actions in the following order:
      * read, write. For example, if this PropertyPermission object
-     * allows both write and read actions, a call to <code>getActions</code>
+     * allows both write and read actions, a call to {@code getActions}
      * will return the string "read,write".
      *
      * @return the canonical string representation of the actions.
--- a/src/java.base/share/classes/java/util/PropertyResourceBundle.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/PropertyResourceBundle.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,18 +51,18 @@
 import sun.util.ResourceBundleEnumeration;
 
 /**
- * <code>PropertyResourceBundle</code> is a concrete subclass of
- * <code>ResourceBundle</code> that manages resources for a locale
+ * {@code PropertyResourceBundle} is a concrete subclass of
+ * {@code ResourceBundle} that manages resources for a locale
  * using a set of static strings from a property file. See
  * {@link ResourceBundle ResourceBundle} for more information about resource
  * bundles.
  *
  * <p>
  * Unlike other types of resource bundle, you don't subclass
- * <code>PropertyResourceBundle</code>.  Instead, you supply properties
- * files containing the resource data.  <code>ResourceBundle.getBundle</code>
+ * {@code PropertyResourceBundle}.  Instead, you supply properties
+ * files containing the resource data.  {@code ResourceBundle.getBundle}
  * will automatically look for the appropriate properties file and create a
- * <code>PropertyResourceBundle</code> that refers to it. See
+ * {@code PropertyResourceBundle} that refers to it. See
  * {@link ResourceBundle#getBundle(String, Locale, ClassLoader) ResourceBundle.getBundle}
  * for a complete description of the search and instantiation strategy.
  *
@@ -71,11 +71,11 @@
  * bundle family with the base name "MyResources".
  * The text defines the bundle "MyResources_de",
  * the German member of the bundle family.
- * This member is based on <code>PropertyResourceBundle</code>, and the text
+ * This member is based on {@code PropertyResourceBundle}, and the text
  * therefore is the content of the file "MyResources_de.properties"
  * (a related <a href="ListResourceBundle.html#sample">example</a> shows
  * how you can add bundles to this family that are implemented as subclasses
- * of <code>ListResourceBundle</code>).
+ * of {@code ListResourceBundle}).
  * The keys in this example are of the form "s1" etc. The actual
  * keys are entirely up to your choice, so long as they are the same as
  * the keys you use in your program to retrieve the objects from the bundle.
@@ -162,7 +162,7 @@
      * @param stream an InputStream that represents a property file
      *        to read from.
      * @throws IOException if an I/O error occurs
-     * @throws NullPointerException if <code>stream</code> is null
+     * @throws NullPointerException if {@code stream} is null
      * @throws IllegalArgumentException if {@code stream} contains a
      *     malformed Unicode escape sequence.
      * @throws MalformedInputException if the system property
@@ -189,7 +189,7 @@
      * @param reader a Reader that represents a property file to
      *        read from.
      * @throws IOException if an I/O error occurs
-     * @throws NullPointerException if <code>reader</code> is null
+     * @throws NullPointerException if {@code reader} is null
      * @throws IllegalArgumentException if a malformed Unicode escape sequence appears
      *     from {@code reader}.
      * @since 1.6
@@ -210,11 +210,11 @@
     }
 
     /**
-     * Returns an <code>Enumeration</code> of the keys contained in
-     * this <code>ResourceBundle</code> and its parent bundles.
+     * Returns an {@code Enumeration} of the keys contained in
+     * this {@code ResourceBundle} and its parent bundles.
      *
-     * @return an <code>Enumeration</code> of the keys contained in
-     *         this <code>ResourceBundle</code> and its parent bundles.
+     * @return an {@code Enumeration} of the keys contained in
+     *         this {@code ResourceBundle} and its parent bundles.
      * @see #keySet()
      */
     public Enumeration<String> getKeys() {
@@ -224,11 +224,11 @@
     }
 
     /**
-     * Returns a <code>Set</code> of the keys contained
-     * <em>only</em> in this <code>ResourceBundle</code>.
+     * Returns a {@code Set} of the keys contained
+     * <em>only</em> in this {@code ResourceBundle}.
      *
-     * @return a <code>Set</code> of the keys contained only in this
-     *         <code>ResourceBundle</code>
+     * @return a {@code Set} of the keys contained only in this
+     *         {@code ResourceBundle}
      * @since 1.6
      * @see #keySet()
      */
--- a/src/java.base/share/classes/java/util/ResourceBundle.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/ResourceBundle.java	Tue Sep 24 09:43:43 2019 +0100
@@ -79,7 +79,7 @@
 /**
  *
  * Resource bundles contain locale-specific objects.  When your program needs a
- * locale-specific resource, a <code>String</code> for example, your program can
+ * locale-specific resource, a {@code String} for example, your program can
  * load it from the resource bundle that is appropriate for the current user's
  * locale. In this way, you can write program code that is largely independent
  * of the user's locale isolating most, if not all, of the locale-specific
@@ -108,8 +108,8 @@
  * Each resource bundle in a family contains the same items, but the items have
  * been translated for the locale represented by that resource bundle.
  * For example, both "MyResources" and "MyResources_de" may have a
- * <code>String</code> that's used on a button for canceling operations.
- * In "MyResources" the <code>String</code> may contain "Cancel" and in
+ * {@code String} that's used on a button for canceling operations.
+ * In "MyResources" the {@code String} may contain "Cancel" and in
  * "MyResources_de" it may contain "Abbrechen".
  *
  * <P>
@@ -121,7 +121,7 @@
  *
  * <P>
  * When your program needs a locale-specific object, it loads
- * the <code>ResourceBundle</code> class using the
+ * the {@code ResourceBundle} class using the
  * {@link #getBundle(java.lang.String, java.util.Locale) getBundle}
  * method:
  * <blockquote>
@@ -134,7 +134,7 @@
  * <P>
  * Resource bundles contain key/value pairs. The keys uniquely
  * identify a locale-specific object in the bundle. Here's an
- * example of a <code>ListResourceBundle</code> that contains
+ * example of a {@code ListResourceBundle} that contains
  * two key/value pairs:
  * <blockquote>
  * <pre>
@@ -150,16 +150,16 @@
  * }
  * </pre>
  * </blockquote>
- * Keys are always <code>String</code>s.
+ * Keys are always {@code String}s.
  * In this example, the keys are "OkKey" and "CancelKey".
  * In the above example, the values
- * are also <code>String</code>s--"OK" and "Cancel"--but
+ * are also {@code String}s--"OK" and "Cancel"--but
  * they don't have to be. The values can be any type of object.
  *
  * <P>
  * You retrieve an object from resource bundle using the appropriate
  * getter method. Because "OkKey" and "CancelKey"
- * are both strings, you would use <code>getString</code> to retrieve them:
+ * are both strings, you would use {@code getString} to retrieve them:
  * <blockquote>
  * <pre>
  * button1 = new Button(myResources.getString("OkKey"));
@@ -168,13 +168,13 @@
  * </blockquote>
  * The getter methods all require the key as an argument and return
  * the object if found. If the object is not found, the getter method
- * throws a <code>MissingResourceException</code>.
+ * throws a {@code MissingResourceException}.
  *
  * <P>
- * Besides <code>getString</code>, <code>ResourceBundle</code> also provides
- * a method for getting string arrays, <code>getStringArray</code>,
- * as well as a generic <code>getObject</code> method for any other
- * type of object. When using <code>getObject</code>, you'll
+ * Besides {@code getString}, {@code ResourceBundle} also provides
+ * a method for getting string arrays, {@code getStringArray},
+ * as well as a generic {@code getObject} method for any other
+ * type of object. When using {@code getObject}, you'll
  * have to cast the result to the appropriate type. For example:
  * <blockquote>
  * <pre>
@@ -183,19 +183,19 @@
  * </blockquote>
  *
  * <P>
- * The Java Platform provides two subclasses of <code>ResourceBundle</code>,
- * <code>ListResourceBundle</code> and <code>PropertyResourceBundle</code>,
+ * The Java Platform provides two subclasses of {@code ResourceBundle},
+ * {@code ListResourceBundle} and {@code PropertyResourceBundle},
  * that provide a fairly simple way to create resources.
- * As you saw briefly in a previous example, <code>ListResourceBundle</code>
+ * As you saw briefly in a previous example, {@code ListResourceBundle}
  * manages its resource as a list of key/value pairs.
- * <code>PropertyResourceBundle</code> uses a properties file to manage
+ * {@code PropertyResourceBundle} uses a properties file to manage
  * its resources.
  *
  * <p>
- * If <code>ListResourceBundle</code> or <code>PropertyResourceBundle</code>
- * do not suit your needs, you can write your own <code>ResourceBundle</code>
- * subclass.  Your subclasses must override two methods: <code>handleGetObject</code>
- * and <code>getKeys()</code>.
+ * If {@code ListResourceBundle} or {@code PropertyResourceBundle}
+ * do not suit your needs, you can write your own {@code ResourceBundle}
+ * subclass.  Your subclasses must override two methods: {@code handleGetObject}
+ * and {@code getKeys()}.
  *
  * <p>
  * The implementation of a {@code ResourceBundle} subclass must be thread-safe
@@ -272,8 +272,8 @@
  * <h3>ResourceBundle.Control</h3>
  *
  * The {@link ResourceBundle.Control} class provides information necessary
- * to perform the bundle loading process by the <code>getBundle</code>
- * factory methods that take a <code>ResourceBundle.Control</code>
+ * to perform the bundle loading process by the {@code getBundle}
+ * factory methods that take a {@code ResourceBundle.Control}
  * instance. You can implement your own subclass in order to enable
  * non-standard resource bundle formats, change the search strategy, or
  * define caching parameters. Refer to the descriptions of the class and the
@@ -302,14 +302,14 @@
  *
  * <h2>Cache Management</h2>
  *
- * Resource bundle instances created by the <code>getBundle</code> factory
+ * Resource bundle instances created by the {@code getBundle} factory
  * methods are cached by default, and the factory methods return the same
  * resource bundle instance multiple times if it has been
- * cached. <code>getBundle</code> clients may clear the cache, manage the
+ * cached. {@code getBundle} clients may clear the cache, manage the
  * lifetime of cached resource bundle instances using time-to-live values,
  * or specify not to cache resource bundle instances. Refer to the
  * descriptions of the {@linkplain #getBundle(String, Locale, ClassLoader,
- * Control) <code>getBundle</code> factory method}, {@link
+ * Control) {@code getBundle} factory method}, {@link
  * #clearCache(ClassLoader) clearCache}, {@link
  * Control#getTimeToLive(String, Locale)
  * ResourceBundle.Control.getTimeToLive}, and {@link
@@ -318,11 +318,11 @@
  *
  * <h2>Example</h2>
  *
- * The following is a very simple example of a <code>ResourceBundle</code>
- * subclass, <code>MyResources</code>, that manages two resources (for a larger number of
- * resources you would probably use a <code>Map</code>).
+ * The following is a very simple example of a {@code ResourceBundle}
+ * subclass, {@code MyResources}, that manages two resources (for a larger number of
+ * resources you would probably use a {@code Map}).
  * Notice that you don't need to supply a value if
- * a "parent-level" <code>ResourceBundle</code> handles the same
+ * a "parent-level" {@code ResourceBundle} handles the same
  * key with the same value (as for the okKey below).
  * <blockquote>
  * <pre>
@@ -360,11 +360,11 @@
  * </pre>
  * </blockquote>
  * You do not have to restrict yourself to using a single family of
- * <code>ResourceBundle</code>s. For example, you could have a set of bundles for
- * exception messages, <code>ExceptionResources</code>
- * (<code>ExceptionResources_fr</code>, <code>ExceptionResources_de</code>, ...),
- * and one for widgets, <code>WidgetResource</code> (<code>WidgetResources_fr</code>,
- * <code>WidgetResources_de</code>, ...); breaking up the resources however you like.
+ * {@code ResourceBundle}s. For example, you could have a set of bundles for
+ * exception messages, {@code ExceptionResources}
+ * ({@code ExceptionResources_fr}, {@code ExceptionResources_de}, ...),
+ * and one for widgets, {@code WidgetResource} ({@code WidgetResources_fr},
+ * {@code WidgetResources_de}, ...); breaking up the resources however you like.
  *
  * @see ListResourceBundle
  * @see PropertyResourceBundle
@@ -512,7 +512,7 @@
      * </blockquote>
      *
      * @param key the key for the desired string
-     * @throws    NullPointerException if <code>key</code> is <code>null</code>
+     * @throws    NullPointerException if {@code key} is {@code null}
      * @throws    MissingResourceException if no object for the given key can be found
      * @throws    ClassCastException if the object found for the given key is not a string
      * @return the string for the given key
@@ -529,7 +529,7 @@
      * </blockquote>
      *
      * @param key the key for the desired string array
-     * @throws    NullPointerException if <code>key</code> is <code>null</code>
+     * @throws    NullPointerException if {@code key} is {@code null}
      * @throws    MissingResourceException if no object for the given key can be found
      * @throws    ClassCastException if the object found for the given key is not a string array
      * @return the string array for the given key
@@ -543,11 +543,11 @@
      * This method first tries to obtain the object from this resource bundle using
      * {@link #handleGetObject(java.lang.String) handleGetObject}.
      * If not successful, and the parent resource bundle is not null,
-     * it calls the parent's <code>getObject</code> method.
+     * it calls the parent's {@code getObject} method.
      * If still not successful, it throws a MissingResourceException.
      *
      * @param key the key for the desired object
-     * @throws    NullPointerException if <code>key</code> is <code>null</code>
+     * @throws    NullPointerException if {@code key} is {@code null}
      * @throws    MissingResourceException if no object for the given key can be found
      * @return the object for the given key
      */
@@ -837,12 +837,12 @@
      * Gets a resource bundle using the specified base name, the default locale,
      * and the caller module. Calling this method is equivalent to calling
      * <blockquote>
-     * <code>getBundle(baseName, Locale.getDefault(), callerModule)</code>,
+     * {@code getBundle(baseName, Locale.getDefault(), callerModule)},
      * </blockquote>
      *
      * @param baseName the base name of the resource bundle, a fully qualified class name
      * @throws    java.lang.NullPointerException
-     *     if <code>baseName</code> is <code>null</code>
+     *     if {@code baseName} is {@code null}
      * @throws    MissingResourceException
      *     if no resource bundle for the specified base name can be found
      * @return a resource bundle for the given base name and the default locale
@@ -866,11 +866,11 @@
      * getBundle(baseName, Locale.getDefault(),
      *           this.getClass().getClassLoader(), control),
      * </pre>
-     * except that <code>getClassLoader()</code> is run with the security
-     * privileges of <code>ResourceBundle</code>.  See {@link
+     * except that {@code getClassLoader()} is run with the security
+     * privileges of {@code ResourceBundle}.  See {@link
      * #getBundle(String, Locale, ClassLoader, Control) getBundle} for the
      * complete description of the resource bundle loading process with a
-     * <code>ResourceBundle.Control</code>.
+     * {@code ResourceBundle.Control}.
      *
      * @param baseName
      *        the base name of the resource bundle, a fully qualified class
@@ -880,14 +880,14 @@
      *        loading process
      * @return a resource bundle for the given base name and the default locale
      * @throws NullPointerException
-     *         if <code>baseName</code> or <code>control</code> is
-     *         <code>null</code>
+     *         if {@code baseName} or {@code control} is
+     *         {@code null}
      * @throws MissingResourceException
      *         if no resource bundle for the specified base name can be found
      * @throws IllegalArgumentException
-     *         if the given <code>control</code> doesn't perform properly
-     *         (e.g., <code>control.getCandidateLocales</code> returns null.)
-     *         Note that validation of <code>control</code> is performed as
+     *         if the given {@code control} doesn't perform properly
+     *         (e.g., {@code control.getCandidateLocales} returns null.)
+     *         Note that validation of {@code control} is performed as
      *         needed.
      * @throws UnsupportedOperationException
      *         if this method is called in a named module
@@ -908,7 +908,7 @@
      * Gets a resource bundle using the specified base name and locale,
      * and the caller module. Calling this method is equivalent to calling
      * <blockquote>
-     * <code>getBundle(baseName, locale, callerModule)</code>,
+     * {@code getBundle(baseName, locale, callerModule)},
      * </blockquote>
      *
      * @param baseName
@@ -916,7 +916,7 @@
      * @param locale
      *        the locale for which a resource bundle is desired
      * @throws    NullPointerException
-     *        if <code>baseName</code> or <code>locale</code> is <code>null</code>
+     *        if {@code baseName} or {@code locale} is {@code null}
      * @throws    MissingResourceException
      *        if no resource bundle for the specified base name can be found
      * @return a resource bundle for the given base name and locale
@@ -937,7 +937,7 @@
      * Gets a resource bundle using the specified base name and the default locale
      * on behalf of the specified module. This method is equivalent to calling
      * <blockquote>
-     * <code>getBundle(baseName, Locale.getDefault(), module)</code>
+     * {@code getBundle(baseName, Locale.getDefault(), module)}
      * </blockquote>
      *
      * @param baseName the base name of the resource bundle,
@@ -1025,11 +1025,11 @@
      * getBundle(baseName, targetLocale, this.getClass().getClassLoader(),
      *           control),
      * </pre>
-     * except that <code>getClassLoader()</code> is run with the security
-     * privileges of <code>ResourceBundle</code>.  See {@link
+     * except that {@code getClassLoader()} is run with the security
+     * privileges of {@code ResourceBundle}.  See {@link
      * #getBundle(String, Locale, ClassLoader, Control) getBundle} for the
      * complete description of the resource bundle loading process with a
-     * <code>ResourceBundle.Control</code>.
+     * {@code ResourceBundle.Control}.
      *
      * @param baseName
      *        the base name of the resource bundle, a fully qualified
@@ -1040,17 +1040,17 @@
      *        the control which gives information for the resource
      *        bundle loading process
      * @return a resource bundle for the given base name and a
-     *         <code>Locale</code> in <code>locales</code>
+     *         {@code Locale} in {@code locales}
      * @throws NullPointerException
-     *         if <code>baseName</code>, <code>locales</code> or
-     *         <code>control</code> is <code>null</code>
+     *         if {@code baseName}, {@code locales} or
+     *         {@code control} is {@code null}
      * @throws MissingResourceException
      *         if no resource bundle for the specified base name in any
-     *         of the <code>locales</code> can be found.
+     *         of the {@code locales} can be found.
      * @throws IllegalArgumentException
-     *         if the given <code>control</code> doesn't perform properly
-     *         (e.g., <code>control.getCandidateLocales</code> returns null.)
-     *         Note that validation of <code>control</code> is performed as
+     *         if the given {@code control} doesn't perform properly
+     *         (e.g., {@code control.getCandidateLocales} returns null.)
+     *         Note that validation of {@code control} is performed as
      *         needed.
      * @throws UnsupportedOperationException
      *         if this method is called in a named module
@@ -1090,7 +1090,7 @@
      * <p>
      * <b><a id="default_behavior">Resource Bundle Search and Loading Strategy</a></b>
      *
-     * <p><code>getBundle</code> uses the base name, the specified locale, and
+     * <p>{@code getBundle} 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
      * id="candidates"><em>candidate bundle names</em></a>.  If the specified
@@ -1140,13 +1140,13 @@
      * MyResource_en
      * </pre>
      *
-     * <blockquote><b>Note:</b> For some <code>Locale</code>s, the list of
+     * <blockquote><b>Note:</b> For some {@code Locale}s, the list of
      * candidate bundle names contains extra names, or the order of bundle names
      * is slightly modified.  See the description of the default implementation
      * of {@link Control#getCandidateLocales(String, Locale)
      * getCandidateLocales} for details.</blockquote>
      *
-     * <p><code>getBundle</code> then iterates over the candidate bundle names
+     * <p>{@code getBundle} then iterates over the candidate bundle names
      * to find the first one for which it can <em>instantiate</em> an actual
      * resource bundle. It uses the default controls' {@link Control#getFormats
      * getFormats} method, which generates two bundle names for each generated
@@ -1156,18 +1156,18 @@
      * <ul><li>First, it attempts to load a class using the generated class name.
      * If such a class can be found and loaded using the specified class
      * loader, is assignment compatible with ResourceBundle, is accessible from
-     * ResourceBundle, and can be instantiated, <code>getBundle</code> creates a
+     * ResourceBundle, and can be instantiated, {@code getBundle} creates a
      * new instance of this class and uses it as the <em>result resource
      * bundle</em>.
      *
-     * <li>Otherwise, <code>getBundle</code> attempts to locate a property
+     * <li>Otherwise, {@code getBundle} attempts to locate a property
      * resource file using the generated properties file name.  It generates a
      * path name from the candidate bundle name by replacing all "." characters
      * with "/" and appending the string ".properties".  It attempts to find a
      * "resource" with this name using {@link
      * java.lang.ClassLoader#getResource(java.lang.String)
      * ClassLoader.getResource}.  (Note that a "resource" in the sense of
-     * <code>getResource</code> has nothing to do with the contents of a
+     * {@code getResource} has nothing to do with the contents of a
      * resource bundle, it is just a container of data, such as a file.)  If it
      * finds a "resource", it attempts to create a new {@link
      * PropertyResourceBundle} instance from its contents.  If successful, this
@@ -1181,14 +1181,14 @@
      * locale and searched again, as above.
      *
      * <p>If still no result bundle is found, the base name alone is looked up. If
-     * this still fails, a <code>MissingResourceException</code> is thrown.
+     * this still fails, a {@code MissingResourceException} is thrown.
      *
      * <p><a id="parent_chain"> Once a result resource bundle has been found,
      * its <em>parent chain</em> is instantiated</a>.  If the result bundle already
      * has a parent (perhaps because it was returned from a cache) the chain is
      * complete.
      *
-     * <p>Otherwise, <code>getBundle</code> examines the remainder of the
+     * <p>Otherwise, {@code getBundle} examines the remainder of the
      * candidate locale list that was used during the pass that generated the
      * result resource bundle.  (As before, candidate bundle names where the
      * final component is an empty string are omitted.)  When it comes to the
@@ -1203,13 +1203,13 @@
      *
      * <p>Once the parent chain is complete, the bundle is returned.
      *
-     * <p><b>Note:</b> <code>getBundle</code> caches instantiated resource
+     * <p><b>Note:</b> {@code getBundle} caches instantiated resource
      * bundles and might return the same resource bundle instance multiple times.
      *
-     * <p><b>Note:</b>The <code>baseName</code> argument should be a fully
+     * <p><b>Note:</b>The {@code baseName} argument should be a fully
      * qualified class name. However, for compatibility with earlier versions,
      * Java SE Runtime Environments do not verify this, and so it is
-     * possible to access <code>PropertyResourceBundle</code>s by specifying a
+     * possible to access {@code PropertyResourceBundle}s by specifying a
      * path name (using "/") instead of a fully qualified class name (using
      * ".").
      *
@@ -1228,11 +1228,11 @@
      * </ul>
      *
      * The contents of all files are valid (that is, public non-abstract
-     * subclasses of <code>ResourceBundle</code> for the ".class" files,
+     * subclasses of {@code ResourceBundle} for the ".class" files,
      * syntactically correct ".properties" files).  The default locale is
-     * <code>Locale("en", "GB")</code>.
+     * {@code Locale("en", "GB")}.
      *
-     * <p>Calling <code>getBundle</code> with the locale arguments below will
+     * <p>Calling {@code getBundle} with the locale arguments below will
      * instantiate resource bundles as follows:
      *
      * <table class="striped">
@@ -1265,7 +1265,7 @@
      * @param loader the class loader from which to load the resource bundle
      * @return a resource bundle for the given base name and locale
      * @throws    java.lang.NullPointerException
-     *        if <code>baseName</code>, <code>locale</code>, or <code>loader</code> is <code>null</code>
+     *        if {@code baseName}, {@code locale}, or {@code loader} is {@code null}
      * @throws    MissingResourceException
      *        if no resource bundle for the specified base name can be found
      * @since 1.2
@@ -1289,14 +1289,14 @@
      * locale, class loader and control. Unlike the {@link
      * #getBundle(String, Locale, ClassLoader) getBundle}
      * factory methods with no {@code control} argument, the given
-     * <code>control</code> specifies how to locate and instantiate resource
+     * {@code control} specifies how to locate and instantiate resource
      * bundles. Conceptually, the bundle loading process with the given
-     * <code>control</code> is performed in the following steps.
+     * {@code control} is performed in the following steps.
      *
      * <ol>
      * <li>This factory method looks up the resource bundle in the cache for
-     * the specified <code>baseName</code>, <code>targetLocale</code> and
-     * <code>loader</code>.  If the requested resource bundle instance is
+     * the specified {@code baseName}, {@code targetLocale} and
+     * {@code loader}.  If the requested resource bundle instance is
      * found in the cache and the time-to-live periods of the instance and
      * all of its parent instances have not expired, the instance is returned
      * to the caller. Otherwise, this factory method proceeds with the
@@ -1305,71 +1305,71 @@
      * <li>The {@link ResourceBundle.Control#getFormats(String)
      * control.getFormats} method is called to get resource bundle formats
      * to produce bundle or resource names. The strings
-     * <code>"java.class"</code> and <code>"java.properties"</code>
+     * {@code "java.class"} and {@code "java.properties"}
      * designate class-based and {@linkplain PropertyResourceBundle
      * property}-based resource bundles, respectively. Other strings
-     * starting with <code>"java."</code> are reserved for future extensions
+     * starting with {@code "java."} are reserved for future extensions
      * and must not be used for application-defined formats. Other strings
      * designate application-defined formats.</li>
      *
      * <li>The {@link ResourceBundle.Control#getCandidateLocales(String,
      * Locale) control.getCandidateLocales} method is called with the target
-     * locale to get a list of <em>candidate <code>Locale</code>s</em> for
+     * locale to get a list of <em>candidate {@code Locale}s</em> for
      * which resource bundles are searched.</li>
      *
      * <li>The {@link ResourceBundle.Control#newBundle(String, Locale,
      * String, ClassLoader, boolean) control.newBundle} method is called to
-     * instantiate a <code>ResourceBundle</code> for the base bundle name, a
+     * instantiate a {@code ResourceBundle} for the base bundle name, a
      * candidate locale, and a format. (Refer to the note on the cache
      * lookup below.) This step is iterated over all combinations of the
-     * candidate locales and formats until the <code>newBundle</code> method
-     * returns a <code>ResourceBundle</code> instance or the iteration has
+     * candidate locales and formats until the {@code newBundle} method
+     * returns a {@code ResourceBundle} instance or the iteration has
      * used up all the combinations. For example, if the candidate locales
-     * are <code>Locale("de", "DE")</code>, <code>Locale("de")</code> and
-     * <code>Locale("")</code> and the formats are <code>"java.class"</code>
-     * and <code>"java.properties"</code>, then the following is the
+     * are {@code Locale("de", "DE")}, {@code Locale("de")} and
+     * {@code Locale("")} and the formats are {@code "java.class"}
+     * and {@code "java.properties"}, then the following is the
      * sequence of locale-format combinations to be used to call
-     * <code>control.newBundle</code>.
+     * {@code control.newBundle}.
      *
      * <table class=striped style="width: 50%; text-align: left; margin-left: 40px;">
      * <caption style="display:none">locale-format combinations for newBundle</caption>
      * <thead>
      * <tr>
      * <th scope="col">Index</th>
-     * <th scope="col"><code>Locale</code></th>
-     * <th scope="col"><code>format</code></th>
+     * <th scope="col">{@code Locale}</th>
+     * <th scope="col">{@code format}</th>
      * </tr>
      * </thead>
      * <tbody>
      * <tr>
      * <th scope="row">1</th>
-     * <td><code>Locale("de", "DE")</code></td>
-     * <td><code>java.class</code></td>
+     * <td>{@code Locale("de", "DE")}</td>
+     * <td>{@code java.class}</td>
      * </tr>
      * <tr>
      * <th scope="row">2</th>
-     * <td><code>Locale("de", "DE")</code></td>
-     * <td><code>java.properties</code></td>
+     * <td>{@code Locale("de", "DE")}</td>
+     * <td>{@code java.properties}</td>
      * </tr>
      * <tr>
      * <th scope="row">3</th>
-     * <td><code>Locale("de")</code></td>
-     * <td><code>java.class</code></td>
+     * <td>{@code Locale("de")}</td>
+     * <td>{@code java.class}</td>
      * </tr>
      * <tr>
      * <th scope="row">4</th>
-     * <td><code>Locale("de")</code></td>
-     * <td><code>java.properties</code></td>
+     * <td>{@code Locale("de")}</td>
+     * <td>{@code java.properties}</td>
      * </tr>
      * <tr>
      * <th scope="row">5</th>
-     * <td><code>Locale("")</code></td>
-     * <td><code>java.class</code></td>
+     * <td>{@code Locale("")}</td>
+     * <td>{@code java.class}</td>
      * </tr>
      * <tr>
      * <th scope="row">6</th>
-     * <td><code>Locale("")</code></td>
-     * <td><code>java.properties</code></td>
+     * <td>{@code Locale("")}</td>
+     * <td>{@code java.properties}</td>
      * </tr>
      * </tbody>
      * </table>
@@ -1377,8 +1377,8 @@
      *
      * <li>If the previous step has found no resource bundle, proceed to
      * Step 6. If a bundle has been found that is a base bundle (a bundle
-     * for <code>Locale("")</code>), and the candidate locale list only contained
-     * <code>Locale("")</code>, return the bundle to the caller. If a bundle
+     * for {@code Locale("")}), and the candidate locale list only contained
+     * {@code Locale("")}, return the bundle to the caller. If a bundle
      * has been found that is a base bundle, but the candidate locale list
      * contained locales other than Locale(""), put the bundle on hold and
      * proceed to Step 6. If a bundle has been found that is not a base
@@ -1410,65 +1410,65 @@
      * String, ClassLoader, ResourceBundle, long) control.needsReload}
      * method to determine whether the resource bundle needs to be reloaded.
      * If reloading is required, the factory method calls
-     * <code>control.newBundle</code> to reload the resource bundle.  If
-     * <code>control.newBundle</code> returns <code>null</code>, the factory
+     * {@code control.newBundle} to reload the resource bundle.  If
+     * {@code control.newBundle} returns {@code null}, the factory
      * method puts a dummy resource bundle in the cache as a mark of
      * nonexistent resource bundles in order to avoid lookup overhead for
      * subsequent requests. Such dummy resource bundles are under the same
-     * expiration control as specified by <code>control</code>.
+     * expiration control as specified by {@code control}.
      *
      * <p>All resource bundles loaded are cached by default. Refer to
      * {@link Control#getTimeToLive(String,Locale)
      * control.getTimeToLive} for details.
      *
      * <p>The following is an example of the bundle loading process with the
-     * default <code>ResourceBundle.Control</code> implementation.
+     * default {@code ResourceBundle.Control} implementation.
      *
      * <p>Conditions:
      * <ul>
-     * <li>Base bundle name: <code>foo.bar.Messages</code>
-     * <li>Requested <code>Locale</code>: {@link Locale#ITALY}</li>
-     * <li>Default <code>Locale</code>: {@link Locale#FRENCH}</li>
+     * <li>Base bundle name: {@code foo.bar.Messages}
+     * <li>Requested {@code Locale}: {@link Locale#ITALY}</li>
+     * <li>Default {@code Locale}: {@link Locale#FRENCH}</li>
      * <li>Available resource bundles:
-     * <code>foo/bar/Messages_fr.properties</code> and
-     * <code>foo/bar/Messages.properties</code></li>
+     * {@code foo/bar/Messages_fr.properties} and
+     * {@code foo/bar/Messages.properties}</li>
      * </ul>
      *
-     * <p>First, <code>getBundle</code> tries loading a resource bundle in
+     * <p>First, {@code getBundle} tries loading a resource bundle in
      * the following sequence.
      *
      * <ul>
-     * <li>class <code>foo.bar.Messages_it_IT</code>
-     * <li>file <code>foo/bar/Messages_it_IT.properties</code>
-     * <li>class <code>foo.bar.Messages_it</code></li>
-     * <li>file <code>foo/bar/Messages_it.properties</code></li>
-     * <li>class <code>foo.bar.Messages</code></li>
-     * <li>file <code>foo/bar/Messages.properties</code></li>
+     * <li>class {@code foo.bar.Messages_it_IT}
+     * <li>file {@code foo/bar/Messages_it_IT.properties}
+     * <li>class {@code foo.bar.Messages_it}</li>
+     * <li>file {@code foo/bar/Messages_it.properties}</li>
+     * <li>class {@code foo.bar.Messages}</li>
+     * <li>file {@code foo/bar/Messages.properties}</li>
      * </ul>
      *
-     * <p>At this point, <code>getBundle</code> finds
-     * <code>foo/bar/Messages.properties</code>, which is put on hold
-     * because it's the base bundle.  <code>getBundle</code> calls {@link
+     * <p>At this point, {@code getBundle} finds
+     * {@code foo/bar/Messages.properties}, which is put on hold
+     * because it's the base bundle.  {@code getBundle} calls {@link
      * Control#getFallbackLocale(String, Locale)
      * control.getFallbackLocale("foo.bar.Messages", Locale.ITALY)} which
-     * returns <code>Locale.FRENCH</code>. Next, <code>getBundle</code>
+     * returns {@code Locale.FRENCH}. Next, {@code getBundle}
      * tries loading a bundle in the following sequence.
      *
      * <ul>
-     * <li>class <code>foo.bar.Messages_fr</code></li>
-     * <li>file <code>foo/bar/Messages_fr.properties</code></li>
-     * <li>class <code>foo.bar.Messages</code></li>
-     * <li>file <code>foo/bar/Messages.properties</code></li>
+     * <li>class {@code foo.bar.Messages_fr}</li>
+     * <li>file {@code foo/bar/Messages_fr.properties}</li>
+     * <li>class {@code foo.bar.Messages}</li>
+     * <li>file {@code foo/bar/Messages.properties}</li>
      * </ul>
      *
-     * <p><code>getBundle</code> finds
-     * <code>foo/bar/Messages_fr.properties</code> and creates a
-     * <code>ResourceBundle</code> instance. Then, <code>getBundle</code>
+     * <p>{@code getBundle} finds
+     * {@code foo/bar/Messages_fr.properties} and creates a
+     * {@code ResourceBundle} instance. Then, {@code getBundle}
      * sets up its parent chain from the list of the candidate locales.  Only
-     * <code>foo/bar/Messages.properties</code> is found in the list and
-     * <code>getBundle</code> creates a <code>ResourceBundle</code> instance
+     * {@code foo/bar/Messages.properties} is found in the list and
+     * {@code getBundle} creates a {@code ResourceBundle} instance
      * that becomes the parent of the instance for
-     * <code>foo/bar/Messages_fr.properties</code>.
+     * {@code foo/bar/Messages_fr.properties}.
      *
      * @param baseName
      *        the base name of the resource bundle, a fully qualified
@@ -1482,15 +1482,15 @@
      *        bundle loading process
      * @return a resource bundle for the given base name and locale
      * @throws NullPointerException
-     *         if <code>baseName</code>, <code>targetLocale</code>,
-     *         <code>loader</code>, or <code>control</code> is
-     *         <code>null</code>
+     *         if {@code baseName}, {@code targetLocale},
+     *         {@code loader}, or {@code control} is
+     *         {@code null}
      * @throws MissingResourceException
      *         if no resource bundle for the specified base name can be found
      * @throws IllegalArgumentException
-     *         if the given <code>control</code> doesn't perform properly
-     *         (e.g., <code>control.getCandidateLocales</code> returns null.)
-     *         Note that validation of <code>control</code> is performed as
+     *         if the given {@code control} doesn't perform properly
+     *         (e.g., {@code control.getCandidateLocales} returns null.)
+     *         Note that validation of {@code control} is performed as
      *         needed.
      * @throws UnsupportedOperationException
      *         if this method is called in a named module
@@ -1700,7 +1700,7 @@
     }
 
     /**
-     * Checks if the given <code>List</code> is not null, not empty,
+     * Checks if the given {@code List} is not null, not empty,
      * not having null in its elements.
      */
     private static boolean checkList(List<?> a) {
@@ -2066,7 +2066,7 @@
      * @param cacheKey the key to look up the cache
      * @param control the Control to be used for the expiration control
      * @return the cached bundle, or null if the bundle is not found in the
-     * cache or its parent has expired. <code>bundle.expire</code> is true
+     * cache or its parent has expired. {@code bundle.expire} is true
      * upon return if the bundle in the cache has expired.
      */
     private static ResourceBundle findBundleInCache(CacheKey cacheKey,
@@ -2250,7 +2250,7 @@
      * by the given class loader.
      *
      * @param loader the class loader
-     * @throws    NullPointerException if <code>loader</code> is null
+     * @throws    NullPointerException if {@code loader} is null
      * @since 1.6
      * @see ResourceBundle.Control#getTimeToLive(String,Locale)
      */
@@ -2271,7 +2271,7 @@
      * object for the given key.
      *
      * @param key the key for the desired object
-     * @throws    NullPointerException if <code>key</code> is <code>null</code>
+     * @throws    NullPointerException if {@code key} is {@code null}
      * @return the object for the given key, or null
      */
     protected abstract Object handleGetObject(String key);
@@ -2279,22 +2279,22 @@
     /**
      * Returns an enumeration of the keys.
      *
-     * @return an <code>Enumeration</code> of the keys contained in
-     *         this <code>ResourceBundle</code> and its parent bundles.
+     * @return an {@code Enumeration} of the keys contained in
+     *         this {@code ResourceBundle} and its parent bundles.
      */
     public abstract Enumeration<String> getKeys();
 
     /**
-     * Determines whether the given <code>key</code> is contained in
-     * this <code>ResourceBundle</code> or its parent bundles.
+     * Determines whether the given {@code key} is contained in
+     * this {@code ResourceBundle} or its parent bundles.
      *
      * @param key
-     *        the resource <code>key</code>
-     * @return <code>true</code> if the given <code>key</code> is
-     *        contained in this <code>ResourceBundle</code> or its
-     *        parent bundles; <code>false</code> otherwise.
+     *        the resource {@code key}
+     * @return {@code true} if the given {@code key} is
+     *        contained in this {@code ResourceBundle} or its
+     *        parent bundles; {@code false} otherwise.
      * @throws    NullPointerException
-     *         if <code>key</code> is <code>null</code>
+     *         if {@code key} is {@code null}
      * @since 1.6
      */
     public boolean containsKey(String key) {
@@ -2310,11 +2310,11 @@
     }
 
     /**
-     * Returns a <code>Set</code> of all keys contained in this
-     * <code>ResourceBundle</code> and its parent bundles.
+     * Returns a {@code Set} of all keys contained in this
+     * {@code ResourceBundle} and its parent bundles.
      *
-     * @return a <code>Set</code> of all keys contained in this
-     *         <code>ResourceBundle</code> and its parent bundles.
+     * @return a {@code Set} of all keys contained in this
+     *         {@code ResourceBundle} and its parent bundles.
      * @since 1.6
      */
     public Set<String> keySet() {
@@ -2326,20 +2326,20 @@
     }
 
     /**
-     * Returns a <code>Set</code> of the keys contained <em>only</em>
-     * in this <code>ResourceBundle</code>.
+     * Returns a {@code Set} of the keys contained <em>only</em>
+     * in this {@code ResourceBundle}.
      *
-     * <p>The default implementation returns a <code>Set</code> of the
+     * <p>The default implementation returns a {@code Set} of the
      * keys returned by the {@link #getKeys() getKeys} method except
      * for the ones for which the {@link #handleGetObject(String)
-     * handleGetObject} method returns <code>null</code>. Once the
-     * <code>Set</code> has been created, the value is kept in this
-     * <code>ResourceBundle</code> in order to avoid producing the
-     * same <code>Set</code> in subsequent calls. Subclasses can
+     * handleGetObject} method returns {@code null}. Once the
+     * {@code Set} has been created, the value is kept in this
+     * {@code ResourceBundle} in order to avoid producing the
+     * same {@code Set} in subsequent calls. Subclasses can
      * override this method for faster handling.
      *
-     * @return a <code>Set</code> of the keys contained only in this
-     *        <code>ResourceBundle</code>
+     * @return a {@code Set} of the keys contained only in this
+     *        {@code ResourceBundle}
      * @since 1.6
      */
     protected Set<String> handleKeySet() {
@@ -2364,11 +2364,11 @@
 
 
     /**
-     * <code>ResourceBundle.Control</code> defines a set of callback methods
+     * {@code ResourceBundle.Control} defines a set of callback methods
      * that are invoked by the {@link ResourceBundle#getBundle(String,
      * Locale, ClassLoader, Control) ResourceBundle.getBundle} factory
      * methods during the bundle loading process. In other words, a
-     * <code>ResourceBundle.Control</code> collaborates with the factory
+     * {@code ResourceBundle.Control} collaborates with the factory
      * methods for loading resource bundles. The default implementation of
      * the callback methods provides the information necessary for the
      * factory methods to perform the <a
@@ -2386,45 +2386,45 @@
      * #toBundleName(String, Locale) toBundleName} and {@link
      * #toResourceName(String, String) toResourceName} methods are defined
      * primarily for convenience in implementing the callback
-     * methods. However, the <code>toBundleName</code> method could be
+     * methods. However, the {@code toBundleName} method could be
      * overridden to provide different conventions in the organization and
-     * packaging of localized resources.  The <code>toResourceName</code>
-     * method is <code>final</code> to avoid use of wrong resource and class
+     * packaging of localized resources.  The {@code toResourceName}
+     * method is {@code final} to avoid use of wrong resource and class
      * name separators.
      *
      * <p>Two factory methods, {@link #getControl(List)} and {@link
      * #getNoFallbackControl(List)}, provide
-     * <code>ResourceBundle.Control</code> instances that implement common
+     * {@code ResourceBundle.Control} instances that implement common
      * variations of the default bundle loading process.
      *
      * <p>The formats returned by the {@link Control#getFormats(String)
      * getFormats} method and candidate locales returned by the {@link
      * ResourceBundle.Control#getCandidateLocales(String, Locale)
      * getCandidateLocales} method must be consistent in all
-     * <code>ResourceBundle.getBundle</code> invocations for the same base
-     * bundle. Otherwise, the <code>ResourceBundle.getBundle</code> methods
+     * {@code ResourceBundle.getBundle} invocations for the same base
+     * bundle. Otherwise, the {@code ResourceBundle.getBundle} methods
      * may return unintended bundles. For example, if only
-     * <code>"java.class"</code> is returned by the <code>getFormats</code>
-     * method for the first call to <code>ResourceBundle.getBundle</code>
-     * and only <code>"java.properties"</code> for the second call, then the
+     * {@code "java.class"} is returned by the {@code getFormats}
+     * method for the first call to {@code ResourceBundle.getBundle}
+     * and only {@code "java.properties"} for the second call, then the
      * second call will return the class-based one that has been cached
      * during the first call.
      *
-     * <p>A <code>ResourceBundle.Control</code> instance must be thread-safe
+     * <p>A {@code ResourceBundle.Control} instance must be thread-safe
      * if it's simultaneously used by multiple threads.
-     * <code>ResourceBundle.getBundle</code> does not synchronize to call
-     * the <code>ResourceBundle.Control</code> methods. The default
+     * {@code ResourceBundle.getBundle} does not synchronize to call
+     * the {@code ResourceBundle.Control} methods. The default
      * implementations of the methods are thread-safe.
      *
-     * <p>Applications can specify <code>ResourceBundle.Control</code>
-     * instances returned by the <code>getControl</code> factory methods or
-     * created from a subclass of <code>ResourceBundle.Control</code> to
+     * <p>Applications can specify {@code ResourceBundle.Control}
+     * instances returned by the {@code getControl} factory methods or
+     * created from a subclass of {@code ResourceBundle.Control} to
      * customize the bundle loading process. The following are examples of
      * changing the default bundle loading process.
      *
      * <p><b>Example 1</b>
      *
-     * <p>The following code lets <code>ResourceBundle.getBundle</code> look
+     * <p>The following code lets {@code ResourceBundle.getBundle} look
      * up only properties-based resources.
      *
      * <pre>
@@ -2438,12 +2438,12 @@
      *
      * Given the resource bundles in the <a
      * href="./ResourceBundle.html#default_behavior_example">example</a> in
-     * the <code>ResourceBundle.getBundle</code> description, this
-     * <code>ResourceBundle.getBundle</code> call loads
-     * <code>MyResources_fr_CH.properties</code> whose parent is
-     * <code>MyResources_fr.properties</code> whose parent is
-     * <code>MyResources.properties</code>. (<code>MyResources_fr_CH.properties</code>
-     * is not hidden, but <code>MyResources_fr_CH.class</code> is.)
+     * the {@code ResourceBundle.getBundle} description, this
+     * {@code ResourceBundle.getBundle} call loads
+     * {@code MyResources_fr_CH.properties} whose parent is
+     * {@code MyResources_fr.properties} whose parent is
+     * {@code MyResources.properties}. ({@code MyResources_fr_CH.properties}
+     * is not hidden, but {@code MyResources_fr_CH.class} is.)
      *
      * <p><b>Example 2</b>
      *
@@ -2529,9 +2529,9 @@
      */
     public static class Control {
         /**
-         * The default format <code>List</code>, which contains the strings
-         * <code>"java.class"</code> and <code>"java.properties"</code>, in
-         * this order. This <code>List</code> is unmodifiable.
+         * The default format {@code List}, which contains the strings
+         * {@code "java.class"} and {@code "java.properties"}, in
+         * this order. This {@code List} is unmodifiable.
          *
          * @see #getFormats(String)
          */
@@ -2539,16 +2539,16 @@
             = List.of("java.class", "java.properties");
 
         /**
-         * The class-only format <code>List</code> containing
-         * <code>"java.class"</code>. This <code>List</code> is unmodifiable.
+         * The class-only format {@code List} containing
+         * {@code "java.class"}. This {@code List} is unmodifiable.
          *
          * @see #getFormats(String)
          */
         public static final List<String> FORMAT_CLASS = List.of("java.class");
 
         /**
-         * The properties-only format <code>List</code> containing
-         * <code>"java.properties"</code>. This <code>List</code> is unmodifiable.
+         * The properties-only format {@code List} containing
+         * {@code "java.properties"}. This {@code List} is unmodifiable.
          *
          * @see #getFormats(String)
          */
@@ -2581,27 +2581,27 @@
         }
 
         /**
-         * Returns a <code>ResourceBundle.Control</code> in which the {@link
+         * Returns a {@code ResourceBundle.Control} in which the {@link
          * #getFormats(String) getFormats} method returns the specified
-         * <code>formats</code>. The <code>formats</code> must be equal to
+         * {@code formats}. The {@code formats} must be equal to
          * one of {@link Control#FORMAT_PROPERTIES}, {@link
          * Control#FORMAT_CLASS} or {@link
-         * Control#FORMAT_DEFAULT}. <code>ResourceBundle.Control</code>
+         * Control#FORMAT_DEFAULT}. {@code ResourceBundle.Control}
          * instances returned by this method are singletons and thread-safe.
          *
          * <p>Specifying {@link Control#FORMAT_DEFAULT} is equivalent to
-         * instantiating the <code>ResourceBundle.Control</code> class,
+         * instantiating the {@code ResourceBundle.Control} class,
          * except that this method returns a singleton.
          *
          * @param formats
          *        the formats to be returned by the
-         *        <code>ResourceBundle.Control.getFormats</code> method
-         * @return a <code>ResourceBundle.Control</code> supporting the
-         *        specified <code>formats</code>
+         *        {@code ResourceBundle.Control.getFormats} method
+         * @return a {@code ResourceBundle.Control} supporting the
+         *        specified {@code formats}
          * @throws    NullPointerException
-         *        if <code>formats</code> is <code>null</code>
+         *        if {@code formats} is {@code null}
          * @throws    IllegalArgumentException
-         *        if <code>formats</code> is unknown
+         *        if {@code formats} is unknown
          */
         public static final Control getControl(List<String> formats) {
             if (formats.equals(Control.FORMAT_PROPERTIES)) {
@@ -2617,26 +2617,26 @@
         }
 
         /**
-         * Returns a <code>ResourceBundle.Control</code> in which the {@link
+         * Returns a {@code ResourceBundle.Control} in which the {@link
          * #getFormats(String) getFormats} method returns the specified
-         * <code>formats</code> and the {@link
+         * {@code formats} and the {@link
          * Control#getFallbackLocale(String, Locale) getFallbackLocale}
-         * method returns <code>null</code>. The <code>formats</code> must
+         * method returns {@code null}. The {@code formats} must
          * be equal to one of {@link Control#FORMAT_PROPERTIES}, {@link
          * Control#FORMAT_CLASS} or {@link Control#FORMAT_DEFAULT}.
-         * <code>ResourceBundle.Control</code> instances returned by this
+         * {@code ResourceBundle.Control} instances returned by this
          * method are singletons and thread-safe.
          *
          * @param formats
          *        the formats to be returned by the
-         *        <code>ResourceBundle.Control.getFormats</code> method
-         * @return a <code>ResourceBundle.Control</code> supporting the
-         *        specified <code>formats</code> with no fallback
-         *        <code>Locale</code> support
+         *        {@code ResourceBundle.Control.getFormats} method
+         * @return a {@code ResourceBundle.Control} supporting the
+         *        specified {@code formats} with no fallback
+         *        {@code Locale} support
          * @throws    NullPointerException
-         *        if <code>formats</code> is <code>null</code>
+         *        if {@code formats} is {@code null}
          * @throws    IllegalArgumentException
-         *        if <code>formats</code> is unknown
+         *        if {@code formats} is unknown
          */
         public static final Control getNoFallbackControl(List<String> formats) {
             if (formats.equals(Control.FORMAT_DEFAULT)) {
@@ -2652,35 +2652,35 @@
         }
 
         /**
-         * Returns a <code>List</code> of <code>String</code>s containing
+         * Returns a {@code List} of {@code String}s containing
          * formats to be used to load resource bundles for the given
-         * <code>baseName</code>. The <code>ResourceBundle.getBundle</code>
+         * {@code baseName}. The {@code ResourceBundle.getBundle}
          * factory method tries to load resource bundles with formats in the
          * order specified by the list. The list returned by this method
-         * must have at least one <code>String</code>. The predefined
-         * formats are <code>"java.class"</code> for class-based resource
-         * bundles and <code>"java.properties"</code> for {@linkplain
+         * must have at least one {@code String}. The predefined
+         * formats are {@code "java.class"} for class-based resource
+         * bundles and {@code "java.properties"} for {@linkplain
          * PropertyResourceBundle properties-based} ones. Strings starting
-         * with <code>"java."</code> are reserved for future extensions and
+         * with {@code "java."} are reserved for future extensions and
          * must not be used by application-defined formats.
          *
          * <p>It is not a requirement to return an immutable (unmodifiable)
-         * <code>List</code>.  However, the returned <code>List</code> must
+         * {@code List}.  However, the returned {@code List} must
          * not be mutated after it has been returned by
-         * <code>getFormats</code>.
+         * {@code getFormats}.
          *
          * <p>The default implementation returns {@link #FORMAT_DEFAULT} so
-         * that the <code>ResourceBundle.getBundle</code> factory method
+         * that the {@code ResourceBundle.getBundle} factory method
          * looks up first class-based resource bundles, then
          * properties-based ones.
          *
          * @param baseName
          *        the base name of the resource bundle, a fully qualified class
          *        name
-         * @return a <code>List</code> of <code>String</code>s containing
+         * @return a {@code List} of {@code String}s containing
          *        formats for loading resource bundles.
          * @throws    NullPointerException
-         *        if <code>baseName</code> is null
+         *        if {@code baseName} is null
          * @see #FORMAT_DEFAULT
          * @see #FORMAT_CLASS
          * @see #FORMAT_PROPERTIES
@@ -2693,11 +2693,11 @@
         }
 
         /**
-         * Returns a <code>List</code> of <code>Locale</code>s as candidate
-         * locales for <code>baseName</code> and <code>locale</code>. This
-         * method is called by the <code>ResourceBundle.getBundle</code>
+         * Returns a {@code List} of {@code Locale}s as candidate
+         * locales for {@code baseName} and {@code locale}. This
+         * method is called by the {@code ResourceBundle.getBundle}
          * factory method each time the factory method tries finding a
-         * resource bundle for a target <code>Locale</code>.
+         * resource bundle for a target {@code Locale}.
          *
          * <p>The sequence of the candidate locales also corresponds to the
          * runtime resource lookup path (also known as the <I>parent
@@ -2707,42 +2707,42 @@
          * must be a {@linkplain Locale#ROOT root locale} if it is desired to
          * have the base bundle as the terminal of the parent chain.
          *
-         * <p>If the given locale is equal to <code>Locale.ROOT</code> (the
-         * root locale), a <code>List</code> containing only the root
-         * <code>Locale</code> must be returned. In this case, the
-         * <code>ResourceBundle.getBundle</code> factory method loads only
+         * <p>If the given locale is equal to {@code Locale.ROOT} (the
+         * root locale), a {@code List} containing only the root
+         * {@code Locale} must be returned. In this case, the
+         * {@code ResourceBundle.getBundle} factory method loads only
          * the base bundle as the resulting resource bundle.
          *
          * <p>It is not a requirement to return an immutable (unmodifiable)
-         * <code>List</code>. However, the returned <code>List</code> must not
+         * {@code List}. However, the returned {@code List} must not
          * be mutated after it has been returned by
-         * <code>getCandidateLocales</code>.
+         * {@code getCandidateLocales}.
          *
-         * <p>The default implementation returns a <code>List</code> containing
-         * <code>Locale</code>s using the rules described below.  In the
+         * <p>The default implementation returns a {@code List} containing
+         * {@code Locale}s using the rules described below.  In the
          * description below, <em>L</em>, <em>S</em>, <em>C</em> and <em>V</em>
          * respectively represent non-empty language, script, country, and
          * variant.  For example, [<em>L</em>, <em>C</em>] represents a
-         * <code>Locale</code> that has non-empty values only for language and
+         * {@code Locale} that has non-empty values only for language and
          * country.  The form <em>L</em>("xx") represents the (non-empty)
-         * language value is "xx".  For all cases, <code>Locale</code>s whose
+         * language value is "xx".  For all cases, {@code Locale}s whose
          * final component values are empty strings are omitted.
          *
-         * <ol><li>For an input <code>Locale</code> with an empty script value,
-         * append candidate <code>Locale</code>s by omitting the final component
+         * <ol><li>For an input {@code Locale} with an empty script value,
+         * append candidate {@code Locale}s by omitting the final component
          * one by one as below:
          *
          * <ul>
          * <li> [<em>L</em>, <em>C</em>, <em>V</em>] </li>
          * <li> [<em>L</em>, <em>C</em>] </li>
          * <li> [<em>L</em>] </li>
-         * <li> <code>Locale.ROOT</code> </li>
+         * <li> {@code Locale.ROOT} </li>
          * </ul></li>
          *
-         * <li>For an input <code>Locale</code> with a non-empty script value,
-         * append candidate <code>Locale</code>s by omitting the final component
+         * <li>For an input {@code Locale} with a non-empty script value,
+         * append candidate {@code Locale}s by omitting the final component
          * up to language, then append candidates generated from the
-         * <code>Locale</code> with country and variant restored:
+         * {@code Locale} with country and variant restored:
          *
          * <ul>
          * <li> [<em>L</em>, <em>S</em>, <em>C</em>, <em>V</em>]</li>
@@ -2751,13 +2751,13 @@
          * <li> [<em>L</em>, <em>C</em>, <em>V</em>]</li>
          * <li> [<em>L</em>, <em>C</em>]</li>
          * <li> [<em>L</em>]</li>
-         * <li> <code>Locale.ROOT</code></li>
+         * <li> {@code Locale.ROOT}</li>
          * </ul></li>
          *
-         * <li>For an input <code>Locale</code> with a variant value consisting
+         * <li>For an input {@code Locale} with a variant value consisting
          * of multiple subtags separated by underscore, generate candidate
-         * <code>Locale</code>s by omitting the variant subtags one by one, then
-         * insert them after every occurrence of <code> Locale</code>s with the
+         * {@code Locale}s by omitting the variant subtags one by one, then
+         * insert them after every occurrence of {@code  Locale}s with the
          * full variant value in the original list.  For example, if
          * the variant consists of two subtags <em>V1</em> and <em>V2</em>:
          *
@@ -2770,10 +2770,10 @@
          * <li> [<em>L</em>, <em>C</em>, <em>V1</em>]</li>
          * <li> [<em>L</em>, <em>C</em>]</li>
          * <li> [<em>L</em>]</li>
-         * <li> <code>Locale.ROOT</code></li>
+         * <li> {@code Locale.ROOT}</li>
          * </ul></li>
          *
-         * <li>Special cases for Chinese.  When an input <code>Locale</code> has the
+         * <li>Special cases for Chinese.  When an input {@code Locale} has the
          * language "zh" (Chinese) and an empty script value, either "Hans" (Simplified) or
          * "Hant" (Traditional) might be supplied, depending on the country.
          * When the country is "CN" (China) or "SG" (Singapore), "Hans" is supplied.
@@ -2786,20 +2786,20 @@
          * <li> [<em>L</em>("zh"), <em>S</em>("Hans")]</li>
          * <li> [<em>L</em>("zh"), <em>C</em>("CN")]</li>
          * <li> [<em>L</em>("zh")]</li>
-         * <li> <code>Locale.ROOT</code></li>
+         * <li> {@code Locale.ROOT}</li>
          * </ul>
          *
-         * For <code>Locale("zh", "TW")</code>, the candidate list will be:
+         * For {@code Locale("zh", "TW")}, the candidate list will be:
          * <ul>
          * <li> [<em>L</em>("zh"), <em>S</em>("Hant"), <em>C</em>("TW")]</li>
          * <li> [<em>L</em>("zh"), <em>S</em>("Hant")]</li>
          * <li> [<em>L</em>("zh"), <em>C</em>("TW")]</li>
          * <li> [<em>L</em>("zh")]</li>
-         * <li> <code>Locale.ROOT</code></li>
+         * <li> {@code Locale.ROOT}</li>
          * </ul></li>
          *
-         * <li>Special cases for Norwegian.  Both <code>Locale("no", "NO",
-         * "NY")</code> and <code>Locale("nn", "NO")</code> represent Norwegian
+         * <li>Special cases for Norwegian.  Both {@code Locale("no", "NO",
+         * "NY")} and {@code Locale("nn", "NO")} represent Norwegian
          * Nynorsk.  When a locale's language is "nn", the standard candidate
          * list is generated up to [<em>L</em>("nn")], and then the following
          * candidates are added:
@@ -2807,20 +2807,20 @@
          * <ul><li> [<em>L</em>("no"), <em>C</em>("NO"), <em>V</em>("NY")]</li>
          * <li> [<em>L</em>("no"), <em>C</em>("NO")]</li>
          * <li> [<em>L</em>("no")]</li>
-         * <li> <code>Locale.ROOT</code></li>
+         * <li> {@code Locale.ROOT}</li>
          * </ul>
          *
-         * If the locale is exactly <code>Locale("no", "NO", "NY")</code>, it is first
-         * converted to <code>Locale("nn", "NO")</code> and then the above procedure is
+         * If the locale is exactly {@code Locale("no", "NO", "NY")}, it is first
+         * converted to {@code Locale("nn", "NO")} and then the above procedure is
          * followed.
          *
          * <p>Also, Java treats the language "no" as a synonym of Norwegian
-         * Bokm&#xE5;l "nb".  Except for the single case <code>Locale("no",
-         * "NO", "NY")</code> (handled above), when an input <code>Locale</code>
-         * has language "no" or "nb", candidate <code>Locale</code>s with
+         * Bokm&#xE5;l "nb".  Except for the single case {@code Locale("no",
+         * "NO", "NY")} (handled above), when an input {@code Locale}
+         * has language "no" or "nb", candidate {@code Locale}s with
          * language code "no" and "nb" are interleaved, first using the
          * requested language, then using its synonym. For example,
-         * <code>Locale("nb", "NO", "POSIX")</code> generates the following
+         * {@code Locale("nb", "NO", "POSIX")} generates the following
          * candidate list:
          *
          * <ul>
@@ -2830,10 +2830,10 @@
          * <li> [<em>L</em>("no"), <em>C</em>("NO")]</li>
          * <li> [<em>L</em>("nb")]</li>
          * <li> [<em>L</em>("no")]</li>
-         * <li> <code>Locale.ROOT</code></li>
+         * <li> {@code Locale.ROOT}</li>
          * </ul>
          *
-         * <code>Locale("no", "NO", "POSIX")</code> would generate the same list
+         * {@code Locale("no", "NO", "POSIX")} would generate the same list
          * except that locales with "no" would appear before the corresponding
          * locales with "nb".</li>
          * </ol>
@@ -2841,19 +2841,19 @@
          * <p>The default implementation uses an {@link ArrayList} that
          * overriding implementations may modify before returning it to the
          * caller. However, a subclass must not modify it after it has
-         * been returned by <code>getCandidateLocales</code>.
+         * been returned by {@code getCandidateLocales}.
          *
-         * <p>For example, if the given <code>baseName</code> is "Messages"
-         * and the given <code>locale</code> is
+         * <p>For example, if the given {@code baseName} is "Messages"
+         * and the given {@code locale} is
          * <code>Locale("ja",&nbsp;"",&nbsp;"XX")</code>, then a
-         * <code>List</code> of <code>Locale</code>s:
+         * {@code List} of {@code Locale}s:
          * <pre>
          *     Locale("ja", "", "XX")
          *     Locale("ja")
          *     Locale.ROOT
          * </pre>
          * is returned. And if the resource bundles for the "ja" and
-         * "" <code>Locale</code>s are found, then the runtime resource
+         * "" {@code Locale}s are found, then the runtime resource
          * lookup path (parent chain) is:
          * <pre>{@code
          *     Messages_ja -> Messages
@@ -2864,11 +2864,11 @@
          *        qualified class name
          * @param locale
          *        the locale for which a resource bundle is desired
-         * @return a <code>List</code> of candidate
-         *        <code>Locale</code>s for the given <code>locale</code>
+         * @return a {@code List} of candidate
+         *        {@code Locale}s for the given {@code locale}
          * @throws    NullPointerException
-         *        if <code>baseName</code> or <code>locale</code> is
-         *        <code>null</code>
+         *        if {@code baseName} or {@code locale} is
+         *        {@code null}
          */
         public List<Locale> getCandidateLocales(String baseName, Locale locale) {
             if (baseName == null) {
@@ -3003,40 +3003,40 @@
         }
 
         /**
-         * Returns a <code>Locale</code> to be used as a fallback locale for
+         * Returns a {@code Locale} to be used as a fallback locale for
          * further resource bundle searches by the
-         * <code>ResourceBundle.getBundle</code> factory method. This method
+         * {@code ResourceBundle.getBundle} factory method. This method
          * is called from the factory method every time when no resulting
-         * resource bundle has been found for <code>baseName</code> and
-         * <code>locale</code>, where locale is either the parameter for
-         * <code>ResourceBundle.getBundle</code> or the previous fallback
+         * resource bundle has been found for {@code baseName} and
+         * {@code locale}, where locale is either the parameter for
+         * {@code ResourceBundle.getBundle} or the previous fallback
          * locale returned by this method.
          *
-         * <p>The method returns <code>null</code> if no further fallback
+         * <p>The method returns {@code null} if no further fallback
          * search is desired.
          *
          * <p>The default implementation returns the {@linkplain
-         * Locale#getDefault() default <code>Locale</code>} if the given
-         * <code>locale</code> isn't the default one.  Otherwise,
-         * <code>null</code> is returned.
+         * Locale#getDefault() default {@code Locale}} if the given
+         * {@code locale} isn't the default one.  Otherwise,
+         * {@code null} is returned.
          *
          * @param baseName
          *        the base name of the resource bundle, a fully
          *        qualified class name for which
-         *        <code>ResourceBundle.getBundle</code> has been
+         *        {@code ResourceBundle.getBundle} has been
          *        unable to find any resource bundles (except for the
          *        base bundle)
          * @param locale
-         *        the <code>Locale</code> for which
-         *        <code>ResourceBundle.getBundle</code> has been
+         *        the {@code Locale} for which
+         *        {@code ResourceBundle.getBundle} has been
          *        unable to find any resource bundles (except for the
          *        base bundle)
-         * @return a <code>Locale</code> for the fallback search,
-         *        or <code>null</code> if no further fallback search
+         * @return a {@code Locale} for the fallback search,
+         *        or {@code null} if no further fallback search
          *        is desired.
          * @throws    NullPointerException
-         *        if <code>baseName</code> or <code>locale</code>
-         *        is <code>null</code>
+         *        if {@code baseName} or {@code locale}
+         *        is {@code null}
          */
         public Locale getFallbackLocale(String baseName, Locale locale) {
             if (baseName == null) {
@@ -3049,14 +3049,14 @@
         /**
          * Instantiates a resource bundle for the given bundle name of the
          * given format and locale, using the given class loader if
-         * necessary. This method returns <code>null</code> if there is no
+         * necessary. This method returns {@code null} if there is no
          * resource bundle available for the given parameters. If a resource
          * bundle can't be instantiated due to an unexpected error, the
-         * error must be reported by throwing an <code>Error</code> or
-         * <code>Exception</code> rather than simply returning
-         * <code>null</code>.
+         * error must be reported by throwing an {@code Error} or
+         * {@code Exception} rather than simply returning
+         * {@code null}.
          *
-         * <p>If the <code>reload</code> flag is <code>true</code>, it
+         * <p>If the {@code reload} flag is {@code true}, it
          * indicates that this method is being called because the previously
          * loaded resource bundle has expired.
          *
@@ -3069,7 +3069,7 @@
          * to the resource bundle is open unconditionally.
          *
          * <p>The default implementation instantiates a
-         * <code>ResourceBundle</code> as follows.
+         * {@code ResourceBundle} as follows.
          *
          * <ul>
          *
@@ -3077,37 +3077,37 @@
          * #toBundleName(String, Locale) toBundleName(baseName,
          * locale)}.</li>
          *
-         * <li>If <code>format</code> is <code>"java.class"</code>, the
+         * <li>If {@code format} is {@code "java.class"}, the
          * {@link Class} specified by the bundle name is loaded with the
          * given class loader. If the {@code Class} is found and accessible
-         * then the <code>ResourceBundle</code> is instantiated.  The
+         * then the {@code ResourceBundle} is instantiated.  The
          * resource bundle is accessible if the package of the bundle class file
          * is open unconditionally; otherwise, {@code IllegalAccessException}
          * will be thrown.
-         * Note that the <code>reload</code> flag is ignored for loading
+         * Note that the {@code reload} flag is ignored for loading
          * class-based resource bundles in this default implementation.
          * </li>
          *
-         * <li>If <code>format</code> is <code>"java.properties"</code>,
+         * <li>If {@code format} is {@code "java.properties"},
          * {@link #toResourceName(String, String) toResourceName(bundlename,
          * "properties")} is called to get the resource name.
-         * If <code>reload</code> is <code>true</code>, {@link
+         * If {@code reload} is {@code true}, {@link
          * ClassLoader#getResource(String) load.getResource} is called
          * to get a {@link URL} for creating a {@link
-         * URLConnection}. This <code>URLConnection</code> is used to
+         * URLConnection}. This {@code URLConnection} is used to
          * {@linkplain URLConnection#setUseCaches(boolean) disable the
          * caches} of the underlying resource loading layers,
          * and to {@linkplain URLConnection#getInputStream() get an
-         * <code>InputStream</code>}.
+         * {@code InputStream}}.
          * Otherwise, {@link ClassLoader#getResourceAsStream(String)
          * loader.getResourceAsStream} is called to get an {@link
          * InputStream}. Then, a {@link
          * PropertyResourceBundle} is constructed with the
-         * <code>InputStream</code>.</li>
+         * {@code InputStream}.</li>
          *
-         * <li>If <code>format</code> is neither <code>"java.class"</code>
-         * nor <code>"java.properties"</code>, an
-         * <code>IllegalArgumentException</code> is thrown.</li>
+         * <li>If {@code format} is neither {@code "java.class"}
+         * nor {@code "java.properties"}, an
+         * {@code IllegalArgumentException} is thrown.</li>
          *
          * </ul>
          *
@@ -3120,23 +3120,23 @@
          * @param format
          *        the resource bundle format to be loaded
          * @param loader
-         *        the <code>ClassLoader</code> to use to load the bundle
+         *        the {@code ClassLoader} to use to load the bundle
          * @param reload
-         *        the flag to indicate bundle reloading; <code>true</code>
+         *        the flag to indicate bundle reloading; {@code true}
          *        if reloading an expired resource bundle,
-         *        <code>false</code> otherwise
+         *        {@code false} otherwise
          * @return the resource bundle instance,
-         *        or <code>null</code> if none could be found.
+         *        or {@code null} if none could be found.
          * @throws    NullPointerException
-         *        if <code>bundleName</code>, <code>locale</code>,
-         *        <code>format</code>, or <code>loader</code> is
-         *        <code>null</code>, or if <code>null</code> is returned by
+         *        if {@code bundleName}, {@code locale},
+         *        {@code format}, or {@code loader} is
+         *        {@code null}, or if {@code null} is returned by
          *        {@link #toBundleName(String, Locale) toBundleName}
          * @throws    IllegalArgumentException
-         *        if <code>format</code> is unknown, or if the resource
+         *        if {@code format} is unknown, or if the resource
          *        found for the given parameters contains malformed data.
          * @throws    ClassCastException
-         *        if the loaded class cannot be cast to <code>ResourceBundle</code>
+         *        if the loaded class cannot be cast to {@code ResourceBundle}
          * @throws    IllegalAccessException
          *        if the class or its nullary constructor is not
          *        accessible.
@@ -3256,7 +3256,7 @@
         /**
          * Returns the time-to-live (TTL) value for resource bundles that
          * are loaded under this
-         * <code>ResourceBundle.Control</code>. Positive time-to-live values
+         * {@code ResourceBundle.Control}. Positive time-to-live values
          * specify the number of milliseconds a bundle can remain in the
          * cache without being validated against the source data from which
          * it was constructed. The value 0 indicates that a bundle must be
@@ -3267,13 +3267,13 @@
          * expiration control.
          *
          * <p>The expiration affects only the bundle loading process by the
-         * <code>ResourceBundle.getBundle</code> factory method.  That is,
+         * {@code ResourceBundle.getBundle} factory method.  That is,
          * if the factory method finds a resource bundle in the cache that
          * has expired, the factory method calls the {@link
          * #needsReload(String, Locale, String, ClassLoader, ResourceBundle,
          * long) needsReload} method to determine whether the resource
-         * bundle needs to be reloaded. If <code>needsReload</code> returns
-         * <code>true</code>, the cached resource bundle instance is removed
+         * bundle needs to be reloaded. If {@code needsReload} returns
+         * {@code true}, the cached resource bundle instance is removed
          * from the cache. Otherwise, the instance stays in the cache,
          * updated with the new TTL value returned by this method.
          *
@@ -3296,8 +3296,8 @@
          *        expiration control, or {@link #TTL_DONT_CACHE} to disable
          *        caching.
          * @throws    NullPointerException
-         *        if <code>baseName</code> or <code>locale</code> is
-         *        <code>null</code>
+         *        if {@code baseName} or {@code locale} is
+         *        {@code null}
          */
         public long getTimeToLive(String baseName, Locale locale) {
             if (baseName == null || locale == null) {
@@ -3307,30 +3307,30 @@
         }
 
         /**
-         * Determines if the expired <code>bundle</code> in the cache needs
+         * Determines if the expired {@code bundle} in the cache needs
          * to be reloaded based on the loading time given by
-         * <code>loadTime</code> or some other criteria. The method returns
-         * <code>true</code> if reloading is required; <code>false</code>
-         * otherwise. <code>loadTime</code> is a millisecond offset since
-         * the <a href="Calendar.html#Epoch"> <code>Calendar</code>
+         * {@code loadTime} or some other criteria. The method returns
+         * {@code true} if reloading is required; {@code false}
+         * otherwise. {@code loadTime} is a millisecond offset since
+         * the <a href="Calendar.html#Epoch"> {@code Calendar}
          * Epoch</a>.
          *
          * <p>
-         * The calling <code>ResourceBundle.getBundle</code> factory method
-         * calls this method on the <code>ResourceBundle.Control</code>
+         * The calling {@code ResourceBundle.getBundle} factory method
+         * calls this method on the {@code ResourceBundle.Control}
          * instance used for its current invocation, not on the instance
          * used in the invocation that originally loaded the resource
          * bundle.
          *
-         * <p>The default implementation compares <code>loadTime</code> and
+         * <p>The default implementation compares {@code loadTime} and
          * the last modified time of the source data of the resource
          * bundle. If it's determined that the source data has been modified
-         * since <code>loadTime</code>, <code>true</code> is
-         * returned. Otherwise, <code>false</code> is returned. This
-         * implementation assumes that the given <code>format</code> is the
+         * since {@code loadTime}, {@code true} is
+         * returned. Otherwise, {@code false} is returned. This
+         * implementation assumes that the given {@code format} is the
          * same string as its file suffix if it's not one of the default
-         * formats, <code>"java.class"</code> or
-         * <code>"java.properties"</code>.
+         * formats, {@code "java.class"} or
+         * {@code "java.properties"}.
          *
          * @param baseName
          *        the base bundle name of the resource bundle, a
@@ -3341,19 +3341,19 @@
          * @param format
          *        the resource bundle format to be loaded
          * @param loader
-         *        the <code>ClassLoader</code> to use to load the bundle
+         *        the {@code ClassLoader} to use to load the bundle
          * @param bundle
          *        the resource bundle instance that has been expired
          *        in the cache
          * @param loadTime
-         *        the time when <code>bundle</code> was loaded and put
+         *        the time when {@code bundle} was loaded and put
          *        in the cache
-         * @return <code>true</code> if the expired bundle needs to be
-         *        reloaded; <code>false</code> otherwise.
+         * @return {@code true} if the expired bundle needs to be
+         *        reloaded; {@code false} otherwise.
          * @throws    NullPointerException
-         *        if <code>baseName</code>, <code>locale</code>,
-         *        <code>format</code>, <code>loader</code>, or
-         *        <code>bundle</code> is <code>null</code>
+         *        if {@code baseName}, {@code locale},
+         *        {@code format}, {@code loader}, or
+         *        {@code bundle} is {@code null}
          */
         public boolean needsReload(String baseName, Locale locale,
                                    String format, ClassLoader loader,
@@ -3400,7 +3400,7 @@
         }
 
         /**
-         * Converts the given <code>baseName</code> and <code>locale</code>
+         * Converts the given {@code baseName} and {@code locale}
          * to the bundle name. This method is called from the default
          * implementation of the {@link #newBundle(String, Locale, String,
          * ClassLoader, boolean) newBundle} and {@link #needsReload(String,
@@ -3411,20 +3411,20 @@
          * <pre>
          *     baseName + "_" + language + "_" + script + "_" + country + "_" + variant
          * </pre>
-         * where <code>language</code>, <code>script</code>, <code>country</code>,
-         * and <code>variant</code> are the language, script, country, and variant
-         * values of <code>locale</code>, respectively. Final component values that
+         * where {@code language}, {@code script}, {@code country},
+         * and {@code variant} are the language, script, country, and variant
+         * values of {@code locale}, respectively. Final component values that
          * are empty Strings are omitted along with the preceding '_'.  When the
          * script is empty, the script value is omitted along with the preceding '_'.
-         * If all of the values are empty strings, then <code>baseName</code>
+         * If all of the values are empty strings, then {@code baseName}
          * is returned.
          *
-         * <p>For example, if <code>baseName</code> is
-         * <code>"baseName"</code> and <code>locale</code> is
+         * <p>For example, if {@code baseName} is
+         * {@code "baseName"} and {@code locale} is
          * <code>Locale("ja",&nbsp;"",&nbsp;"XX")</code>, then
          * <code>"baseName_ja_&thinsp;_XX"</code> is returned. If the given
-         * locale is <code>Locale("en")</code>, then
-         * <code>"baseName_en"</code> is returned.
+         * locale is {@code Locale("en")}, then
+         * {@code "baseName_en"} is returned.
          *
          * <p>Overriding this method allows applications to use different
          * conventions in the organization and packaging of localized
@@ -3438,8 +3438,8 @@
          *        loaded
          * @return the bundle name for the resource bundle
          * @throws    NullPointerException
-         *        if <code>baseName</code> or <code>locale</code>
-         *        is <code>null</code>
+         *        if {@code baseName} or {@code locale}
+         *        is {@code null}
          * @see java.util.spi.AbstractResourceBundleProvider#toBundleName(String, Locale)
          */
         public String toBundleName(String baseName, Locale locale) {
--- a/src/java.base/share/classes/java/util/SimpleTimeZone.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/SimpleTimeZone.java	Tue Sep 24 09:43:43 2019 +0100
@@ -48,7 +48,7 @@
 import sun.util.calendar.Gregorian;
 
 /**
- * <code>SimpleTimeZone</code> is a concrete subclass of <code>TimeZone</code>
+ * {@code SimpleTimeZone} is a concrete subclass of {@code TimeZone}
  * that represents a time zone for use with a Gregorian calendar.
  * The class holds an offset from GMT, called <em>raw offset</em>, and start
  * and end rules for a daylight saving time schedule.  Since it only holds
@@ -57,7 +57,7 @@
  * #setStartYear setStartYear} method can specify the year when the daylight
  * saving time schedule starts in effect.
  * <p>
- * To construct a <code>SimpleTimeZone</code> with a daylight saving time
+ * To construct a {@code SimpleTimeZone} with a daylight saving time
  * schedule, the schedule can be described with a set of rules,
  * <em>start-rule</em> and <em>end-rule</em>. A day when daylight saving time
  * starts or ends is specified by a combination of <em>month</em>,
@@ -81,7 +81,7 @@
  * or after which the rule is applied, and <em>day-of-week</em> to a negative {@link
  * Calendar#DAY_OF_WEEK DAY_OF_WEEK} field value. For example, to specify the
  * second Sunday of April, set <em>month</em> to {@link Calendar#APRIL APRIL},
- * <em>day-of-month</em> to 8, and <em>day-of-week</em> to <code>-</code>{@link
+ * <em>day-of-month</em> to 8, and <em>day-of-week</em> to {@code -}{@link
  * Calendar#SUNDAY SUNDAY}.</li>
  *
  * <li><b>Day of week on or before day of month</b><br>
@@ -89,7 +89,7 @@
  * <em>day-of-month</em> and <em>day-of-week</em> to a negative value. For
  * example, to specify the last Wednesday on or before the 21st of March, set
  * <em>month</em> to {@link Calendar#MARCH MARCH}, <em>day-of-month</em> is -21
- * and <em>day-of-week</em> is <code>-</code>{@link Calendar#WEDNESDAY WEDNESDAY}. </li>
+ * and <em>day-of-week</em> is {@code -}{@link Calendar#WEDNESDAY WEDNESDAY}. </li>
  *
  * <li><b>Last day-of-week of month</b><br>
  * To specify, the last day-of-week of the month, set <em>day-of-week</em> to a
@@ -139,7 +139,7 @@
  *                     3600000)
  * </code></pre>
  * These parameter rules are also applicable to the set rule methods, such as
- * <code>setStartRule</code>.
+ * {@code setStartRule}.
  *
  * @since 1.1
  * @see      Calendar
@@ -167,7 +167,7 @@
      * Constructs a SimpleTimeZone with the given base time zone offset from
      * GMT, time zone ID, and rules for starting and ending the daylight
      * time.
-     * Both <code>startTime</code> and <code>endTime</code> are specified to be
+     * Both {@code startTime} and {@code endTime} are specified to be
      * represented in the wall clock time. The amount of daylight saving is
      * assumed to be 3600000 milliseconds (i.e., one hour). This constructor is
      * equivalent to:
@@ -226,7 +226,7 @@
      * Constructs a SimpleTimeZone with the given base time zone offset from
      * GMT, time zone ID, and rules for starting and ending the daylight
      * time.
-     * Both <code>startTime</code> and <code>endTime</code> are assumed to be
+     * Both {@code startTime} and {@code endTime} are assumed to be
      * represented in the wall clock time. This constructor is equivalent to:
      * <pre><code>
      *     SimpleTimeZone(rawOffset,
@@ -286,8 +286,8 @@
      * GMT, time zone ID, and rules for starting and ending the daylight
      * time.
      * This constructor takes the full set of the start and end rules
-     * parameters, including modes of <code>startTime</code> and
-     * <code>endTime</code>. The mode specifies either {@link #WALL_TIME wall
+     * parameters, including modes of {@code startTime} and
+     * {@code endTime}. The mode specifies either {@link #WALL_TIME wall
      * time} or {@link #STANDARD_TIME standard time} or {@link #UTC_TIME UTC
      * time}.
      *
@@ -301,7 +301,7 @@
      * @param startDayOfWeek  The daylight saving time starting day-of-week.
      *                        See the class description for the special cases of this parameter.
      * @param startTime       The daylight saving time starting time in the time mode
-     *                        specified by <code>startTimeMode</code>.
+     *                        specified by {@code startTimeMode}.
      * @param startTimeMode   The mode of the start time specified by startTime.
      * @param endMonth        The daylight saving time ending month. Month is
      *                        a {@link Calendar#MONTH MONTH} field
@@ -311,7 +311,7 @@
      * @param endDayOfWeek    The daylight saving time ending day-of-week.
      *                        See the class description for the special cases of this parameter.
      * @param endTime         The daylight saving ending time in time mode
-     *                        specified by <code>endTimeMode</code>.
+     *                        specified by {@code endTimeMode}.
      * @param endTimeMode     The mode of the end time specified by endTime
      * @param dstSavings      The amount of time in milliseconds saved during
      *                        daylight saving time.
@@ -369,7 +369,7 @@
      * Sets the daylight saving time start rule. For example, if daylight saving
      * time starts on the first Sunday in April at 2 am in local wall clock
      * time, you can set the start rule by calling:
-     * <pre><code>setStartRule(Calendar.APRIL, 1, Calendar.SUNDAY, 2*60*60*1000);</code></pre>
+     * <pre>{@code setStartRule(Calendar.APRIL, 1, Calendar.SUNDAY, 2*60*60*1000);}</pre>
      *
      * @param startMonth      The daylight saving time starting month. Month is
      *                        a {@link Calendar#MONTH MONTH} field
@@ -380,8 +380,8 @@
      *                        See the class description for the special cases of this parameter.
      * @param startTime       The daylight saving time starting time in local wall clock
      *                        time, which is local standard time in this case.
-     * @throws    IllegalArgumentException if the <code>startMonth</code>, <code>startDay</code>,
-     * <code>startDayOfWeek</code>, or <code>startTime</code> parameters are out of range
+     * @throws    IllegalArgumentException if the {@code startMonth}, {@code startDay},
+     * {@code startDayOfWeek}, or {@code startTime} parameters are out of range
      */
     public void setStartRule(int startMonth, int startDay, int startDayOfWeek, int startTime)
     {
@@ -397,7 +397,7 @@
     /**
      * Sets the daylight saving time start rule to a fixed date within a month.
      * This method is equivalent to:
-     * <pre><code>setStartRule(startMonth, startDay, 0, startTime)</code></pre>
+     * <pre>{@code setStartRule(startMonth, startDay, 0, startTime)}</pre>
      *
      * @param startMonth      The daylight saving time starting month. Month is
      *                        a {@link Calendar#MONTH MONTH} field
@@ -406,8 +406,8 @@
      * @param startTime       The daylight saving time starting time in local wall clock
      *                        time, which is local standard time in this case.
      *                        See the class description for the special cases of this parameter.
-     * @throws    IllegalArgumentException if the <code>startMonth</code>,
-     * <code>startDayOfMonth</code>, or <code>startTime</code> parameters are out of range
+     * @throws    IllegalArgumentException if the {@code startMonth},
+     * {@code startDayOfMonth}, or {@code startTime} parameters are out of range
      * @since 1.2
      */
     public void setStartRule(int startMonth, int startDay, int startTime) {
@@ -425,12 +425,12 @@
      * @param startDayOfWeek  The daylight saving time starting day-of-week.
      * @param startTime       The daylight saving time starting time in local wall clock
      *                        time, which is local standard time in this case.
-     * @param after           If true, this rule selects the first <code>dayOfWeek</code> on or
-     *                        <em>after</em> <code>dayOfMonth</code>.  If false, this rule
-     *                        selects the last <code>dayOfWeek</code> on or <em>before</em>
-     *                        <code>dayOfMonth</code>.
-     * @throws    IllegalArgumentException if the <code>startMonth</code>, <code>startDay</code>,
-     * <code>startDayOfWeek</code>, or <code>startTime</code> parameters are out of range
+     * @param after           If true, this rule selects the first {@code dayOfWeek} on or
+     *                        <em>after</em> {@code dayOfMonth}.  If false, this rule
+     *                        selects the last {@code dayOfWeek} on or <em>before</em>
+     *                        {@code dayOfMonth}.
+     * @throws    IllegalArgumentException if the {@code startMonth}, {@code startDay},
+     * {@code startDayOfWeek}, or {@code startTime} parameters are out of range
      * @since 1.2
      */
     public void setStartRule(int startMonth, int startDay, int startDayOfWeek,
@@ -448,7 +448,7 @@
      * Sets the daylight saving time end rule. For example, if daylight saving time
      * ends on the last Sunday in October at 2 am in wall clock time,
      * you can set the end rule by calling:
-     * <code>setEndRule(Calendar.OCTOBER, -1, Calendar.SUNDAY, 2*60*60*1000);</code>
+     * {@code setEndRule(Calendar.OCTOBER, -1, Calendar.SUNDAY, 2*60*60*1000);}
      *
      * @param endMonth        The daylight saving time ending month. Month is
      *                        a {@link Calendar#MONTH MONTH} field
@@ -460,8 +460,8 @@
      * @param endTime         The daylight saving ending time in local wall clock time,
      *                        (in milliseconds within the day) which is local daylight
      *                        time in this case.
-     * @throws    IllegalArgumentException if the <code>endMonth</code>, <code>endDay</code>,
-     * <code>endDayOfWeek</code>, or <code>endTime</code> parameters are out of range
+     * @throws    IllegalArgumentException if the {@code endMonth}, {@code endDay},
+     * {@code endDayOfWeek}, or {@code endTime} parameters are out of range
      */
     public void setEndRule(int endMonth, int endDay, int endDayOfWeek,
                            int endTime)
@@ -478,7 +478,7 @@
     /**
      * Sets the daylight saving time end rule to a fixed date within a month.
      * This method is equivalent to:
-     * <pre><code>setEndRule(endMonth, endDay, 0, endTime)</code></pre>
+     * <pre>{@code setEndRule(endMonth, endDay, 0, endTime)}</pre>
      *
      * @param endMonth        The daylight saving time ending month. Month is
      *                        a {@link Calendar#MONTH MONTH} field
@@ -487,8 +487,8 @@
      * @param endTime         The daylight saving ending time in local wall clock time,
      *                        (in milliseconds within the day) which is local daylight
      *                        time in this case.
-     * @throws    IllegalArgumentException the <code>endMonth</code>, <code>endDay</code>,
-     * or <code>endTime</code> parameters are out of range
+     * @throws    IllegalArgumentException the {@code endMonth}, {@code endDay},
+     * or {@code endTime} parameters are out of range
      * @since 1.2
      */
     public void setEndRule(int endMonth, int endDay, int endTime)
@@ -508,12 +508,12 @@
      * @param endTime         The daylight saving ending time in local wall clock time,
      *                        (in milliseconds within the day) which is local daylight
      *                        time in this case.
-     * @param after           If true, this rule selects the first <code>endDayOfWeek</code> on
-     *                        or <em>after</em> <code>endDay</code>.  If false, this rule
-     *                        selects the last <code>endDayOfWeek</code> on or before
-     *                        <code>endDay</code> of the month.
-     * @throws    IllegalArgumentException the <code>endMonth</code>, <code>endDay</code>,
-     * <code>endDayOfWeek</code>, or <code>endTime</code> parameters are out of range
+     * @param after           If true, this rule selects the first {@code endDayOfWeek} on
+     *                        or <em>after</em> {@code endDay}.  If false, this rule
+     *                        selects the last {@code endDayOfWeek} on or before
+     *                        {@code endDay} of the month.
+     * @throws    IllegalArgumentException the {@code endMonth}, {@code endDay},
+     * {@code endDayOfWeek}, or {@code endTime} parameters are out of range
      * @since 1.2
      */
     public void setEndRule(int endMonth, int endDay, int endDayOfWeek, int endTime, boolean after)
@@ -583,10 +583,10 @@
      * uses a default {@link GregorianCalendar} object as its
      * underlying calendar, such as for determining leap years.  Do
      * not use the result of this method with a calendar other than a
-     * default <code>GregorianCalendar</code>.
+     * default {@code GregorianCalendar}.
      *
      * <p><em>Note:  In general, clients should use
-     * <code>Calendar.get(ZONE_OFFSET) + Calendar.get(DST_OFFSET)</code>
+     * {@code Calendar.get(ZONE_OFFSET) + Calendar.get(DST_OFFSET)}
      * instead of calling this method.</em>
      *
      * @param era       The era of the given date.
@@ -597,9 +597,9 @@
      * @param dayOfWeek The day-of-week of the given date.
      * @param millis    The milliseconds in day in <em>standard</em> local time.
      * @return          The milliseconds to add to UTC to get local time.
-     * @throws          IllegalArgumentException the <code>era</code>,
-     *                  <code>month</code>, <code>day</code>, <code>dayOfWeek</code>,
-     *                  or <code>millis</code> parameters are out of range
+     * @throws          IllegalArgumentException the {@code era},
+     *                  {@code month}, {@code day}, {@code dayOfWeek},
+     *                  or {@code millis} parameters are out of range
      */
     public int getOffset(int era, int year, int month, int day, int dayOfWeek,
                          int millis)
@@ -853,7 +853,7 @@
     }
 
     /**
-     * Returns a clone of this <code>SimpleTimeZone</code> instance.
+     * Returns a clone of this {@code SimpleTimeZone} instance.
      * @return a clone of this instance.
      */
     public Object clone()
@@ -872,11 +872,11 @@
     }
 
     /**
-     * Compares the equality of two <code>SimpleTimeZone</code> objects.
+     * Compares the equality of two {@code SimpleTimeZone} objects.
      *
-     * @param obj  The <code>SimpleTimeZone</code> object to be compared with.
-     * @return     True if the given <code>obj</code> is the same as this
-     *             <code>SimpleTimeZone</code> object; false otherwise.
+     * @param obj  The {@code SimpleTimeZone} object to be compared with.
+     * @return     True if the given {@code obj} is the same as this
+     *             {@code SimpleTimeZone} object; false otherwise.
      */
     public boolean equals(Object obj)
     {
@@ -894,9 +894,9 @@
     }
 
     /**
-     * Returns <code>true</code> if this zone has the same rules and offset as another zone.
+     * Returns {@code true} if this zone has the same rules and offset as another zone.
      * @param other the TimeZone object to be compared with
-     * @return <code>true</code> if the given zone is a SimpleTimeZone and has the
+     * @return {@code true} if the given zone is a SimpleTimeZone and has the
      * same rules and offset as this one
      * @since 1.2
      */
@@ -957,10 +957,10 @@
 
     /**
      * The month in which daylight saving time starts.  This value must be
-     * between <code>Calendar.JANUARY</code> and
-     * <code>Calendar.DECEMBER</code> inclusive.  This value must not equal
-     * <code>endMonth</code>.
-     * <p>If <code>useDaylight</code> is false, this value is ignored.
+     * between {@code Calendar.JANUARY} and
+     * {@code Calendar.DECEMBER} inclusive.  This value must not equal
+     * {@code endMonth}.
+     * <p>If {@code useDaylight} is false, this value is ignored.
      * @serial
      */
     private int startMonth;
@@ -968,34 +968,34 @@
     /**
      * This field has two possible interpretations:
      * <dl>
-     * <dt><code>startMode == DOW_IN_MONTH</code></dt>
+     * <dt>{@code startMode == DOW_IN_MONTH}</dt>
      * <dd>
-     * <code>startDay</code> indicates the day of the month of
-     * <code>startMonth</code> on which daylight
+     * {@code startDay} indicates the day of the month of
+     * {@code startMonth} on which daylight
      * saving time starts, from 1 to 28, 30, or 31, depending on the
-     * <code>startMonth</code>.
+     * {@code startMonth}.
      * </dd>
-     * <dt><code>startMode != DOW_IN_MONTH</code></dt>
+     * <dt>{@code startMode != DOW_IN_MONTH}</dt>
      * <dd>
-     * <code>startDay</code> indicates which <code>startDayOfWeek</code> in the
-     * month <code>startMonth</code> daylight
+     * {@code startDay} indicates which {@code startDayOfWeek} in the
+     * month {@code startMonth} daylight
      * saving time starts on.  For example, a value of +1 and a
-     * <code>startDayOfWeek</code> of <code>Calendar.SUNDAY</code> indicates the
-     * first Sunday of <code>startMonth</code>.  Likewise, +2 would indicate the
+     * {@code startDayOfWeek} of {@code Calendar.SUNDAY} indicates the
+     * first Sunday of {@code startMonth}.  Likewise, +2 would indicate the
      * second Sunday, and -1 the last Sunday.  A value of 0 is illegal.
      * </dd>
      * </dl>
-     * <p>If <code>useDaylight</code> is false, this value is ignored.
+     * <p>If {@code useDaylight} is false, this value is ignored.
      * @serial
      */
     private int startDay;
 
     /**
      * The day of the week on which daylight saving time starts.  This value
-     * must be between <code>Calendar.SUNDAY</code> and
-     * <code>Calendar.SATURDAY</code> inclusive.
-     * <p>If <code>useDaylight</code> is false or
-     * <code>startMode == DAY_OF_MONTH</code>, this value is ignored.
+     * must be between {@code Calendar.SUNDAY} and
+     * {@code Calendar.SATURDAY} inclusive.
+     * <p>If {@code useDaylight} is false or
+     * {@code startMode == DAY_OF_MONTH}, this value is ignored.
      * @serial
      */
     private int startDayOfWeek;
@@ -1003,8 +1003,8 @@
     /**
      * The time in milliseconds after midnight at which daylight saving
      * time starts.  This value is expressed as wall time, standard time,
-     * or UTC time, depending on the setting of <code>startTimeMode</code>.
-     * <p>If <code>useDaylight</code> is false, this value is ignored.
+     * or UTC time, depending on the setting of {@code startTimeMode}.
+     * <p>If {@code useDaylight} is false, this value is ignored.
      * @serial
      */
     private int startTime;
@@ -1018,10 +1018,10 @@
 
     /**
      * The month in which daylight saving time ends.  This value must be
-     * between <code>Calendar.JANUARY</code> and
-     * <code>Calendar.UNDECIMBER</code>.  This value must not equal
-     * <code>startMonth</code>.
-     * <p>If <code>useDaylight</code> is false, this value is ignored.
+     * between {@code Calendar.JANUARY} and
+     * {@code Calendar.UNDECIMBER}.  This value must not equal
+     * {@code startMonth}.
+     * <p>If {@code useDaylight} is false, this value is ignored.
      * @serial
      */
     private int endMonth;
@@ -1029,34 +1029,34 @@
     /**
      * This field has two possible interpretations:
      * <dl>
-     * <dt><code>endMode == DOW_IN_MONTH</code></dt>
+     * <dt>{@code endMode == DOW_IN_MONTH}</dt>
      * <dd>
-     * <code>endDay</code> indicates the day of the month of
-     * <code>endMonth</code> on which daylight
+     * {@code endDay} indicates the day of the month of
+     * {@code endMonth} on which daylight
      * saving time ends, from 1 to 28, 30, or 31, depending on the
-     * <code>endMonth</code>.
+     * {@code endMonth}.
      * </dd>
-     * <dt><code>endMode != DOW_IN_MONTH</code></dt>
+     * <dt>{@code endMode != DOW_IN_MONTH}</dt>
      * <dd>
-     * <code>endDay</code> indicates which <code>endDayOfWeek</code> in th
-     * month <code>endMonth</code> daylight
+     * {@code endDay} indicates which {@code endDayOfWeek} in th
+     * month {@code endMonth} daylight
      * saving time ends on.  For example, a value of +1 and a
-     * <code>endDayOfWeek</code> of <code>Calendar.SUNDAY</code> indicates the
-     * first Sunday of <code>endMonth</code>.  Likewise, +2 would indicate the
+     * {@code endDayOfWeek} of {@code Calendar.SUNDAY} indicates the
+     * first Sunday of {@code endMonth}.  Likewise, +2 would indicate the
      * second Sunday, and -1 the last Sunday.  A value of 0 is illegal.
      * </dd>
      * </dl>
-     * <p>If <code>useDaylight</code> is false, this value is ignored.
+     * <p>If {@code useDaylight} is false, this value is ignored.
      * @serial
      */
     private int endDay;
 
     /**
      * The day of the week on which daylight saving time ends.  This value
-     * must be between <code>Calendar.SUNDAY</code> and
-     * <code>Calendar.SATURDAY</code> inclusive.
-     * <p>If <code>useDaylight</code> is false or
-     * <code>endMode == DAY_OF_MONTH</code>, this value is ignored.
+     * must be between {@code Calendar.SUNDAY} and
+     * {@code Calendar.SATURDAY} inclusive.
+     * <p>If {@code useDaylight} is false or
+     * {@code endMode == DAY_OF_MONTH}, this value is ignored.
      * @serial
      */
     private int endDayOfWeek;
@@ -1064,15 +1064,15 @@
     /**
      * The time in milliseconds after midnight at which daylight saving
      * time ends.  This value is expressed as wall time, standard time,
-     * or UTC time, depending on the setting of <code>endTimeMode</code>.
-     * <p>If <code>useDaylight</code> is false, this value is ignored.
+     * or UTC time, depending on the setting of {@code endTimeMode}.
+     * <p>If {@code useDaylight} is false, this value is ignored.
      * @serial
      */
     private int endTime;
 
     /**
-     * The format of endTime, either <code>WALL_TIME</code>,
-     * <code>STANDARD_TIME</code>, or <code>UTC_TIME</code>.
+     * The format of endTime, either {@code WALL_TIME},
+     * {@code STANDARD_TIME}, or {@code UTC_TIME}.
      * @serial
      * @since 1.3
      */
@@ -1081,8 +1081,8 @@
     /**
      * The year in which daylight saving time is first observed.  This is an {@link GregorianCalendar#AD AD}
      * value.  If this value is less than 1 then daylight saving time is observed
-     * for all <code>AD</code> years.
-     * <p>If <code>useDaylight</code> is false, this value is ignored.
+     * for all {@code AD} years.
+     * <p>If {@code useDaylight} is false, this value is ignored.
      * @serial
      */
     private int startYear;
@@ -1091,7 +1091,7 @@
      * The offset in milliseconds between this zone and GMT.  Negative offsets
      * are to the west of Greenwich.  To obtain local <em>standard</em> time,
      * add the offset to GMT time.  To obtain local wall time it may also be
-     * necessary to add <code>dstSavings</code>.
+     * necessary to add {@code dstSavings}.
      * @serial
      */
     private int rawOffset;
@@ -1122,26 +1122,26 @@
      * Variables specifying the mode of the start rule.  Takes the following
      * values:
      * <dl>
-     * <dt><code>DOM_MODE</code></dt>
+     * <dt>{@code DOM_MODE}</dt>
      * <dd>
      * Exact day of week; e.g., March 1.
      * </dd>
-     * <dt><code>DOW_IN_MONTH_MODE</code></dt>
+     * <dt>{@code DOW_IN_MONTH_MODE}</dt>
      * <dd>
      * Day of week in month; e.g., last Sunday in March.
      * </dd>
-     * <dt><code>DOW_GE_DOM_MODE</code></dt>
+     * <dt>{@code DOW_GE_DOM_MODE}</dt>
      * <dd>
      * Day of week after day of month; e.g., Sunday on or after March 15.
      * </dd>
-     * <dt><code>DOW_LE_DOM_MODE</code></dt>
+     * <dt>{@code DOW_LE_DOM_MODE}</dt>
      * <dd>
      * Day of week before day of month; e.g., Sunday on or before March 15.
      * </dd>
      * </dl>
      * The setting of this field affects the interpretation of the
-     * <code>startDay</code> field.
-     * <p>If <code>useDaylight</code> is false, this value is ignored.
+     * {@code startDay} field.
+     * <p>If {@code useDaylight} is false, this value is ignored.
      * @serial
      * @since 1.1.4
      */
@@ -1151,26 +1151,26 @@
      * Variables specifying the mode of the end rule.  Takes the following
      * values:
      * <dl>
-     * <dt><code>DOM_MODE</code></dt>
+     * <dt>{@code DOM_MODE}</dt>
      * <dd>
      * Exact day of week; e.g., March 1.
      * </dd>
-     * <dt><code>DOW_IN_MONTH_MODE</code></dt>
+     * <dt>{@code DOW_IN_MONTH_MODE}</dt>
      * <dd>
      * Day of week in month; e.g., last Sunday in March.
      * </dd>
-     * <dt><code>DOW_GE_DOM_MODE</code></dt>
+     * <dt>{@code DOW_GE_DOM_MODE}</dt>
      * <dd>
      * Day of week after day of month; e.g., Sunday on or after March 15.
      * </dd>
-     * <dt><code>DOW_LE_DOM_MODE</code></dt>
+     * <dt>{@code DOW_LE_DOM_MODE}</dt>
      * <dd>
      * Day of week before day of month; e.g., Sunday on or before March 15.
      * </dd>
      * </dl>
      * The setting of this field affects the interpretation of the
-     * <code>endDay</code> field.
-     * <p>If <code>useDaylight</code> is false, this value is ignored.
+     * {@code endDay} field.
+     * <p>If {@code useDaylight} is false, this value is ignored.
      * @serial
      * @since 1.1.4
      */
@@ -1180,7 +1180,7 @@
      * A positive value indicating the amount of time saved during DST in
      * milliseconds.
      * Typically one hour (3600000); sometimes 30 minutes (1800000).
-     * <p>If <code>useDaylight</code> is false, this value is ignored.
+     * <p>If {@code useDaylight} is false, this value is ignored.
      * @serial
      * @since 1.1.4
      */
@@ -1260,17 +1260,17 @@
      * </dd>
      * <dt><b>1</b></dt>
      * <dd>
-     * JDK 1.1.4 or later.  Includes three new fields: <code>startMode</code>,
-     * <code>endMode</code>, and <code>dstSavings</code>.
+     * JDK 1.1.4 or later.  Includes three new fields: {@code startMode},
+     * {@code endMode}, and {@code dstSavings}.
      * </dd>
      * <dt><b>2</b></dt>
      * <dd>
-     * JDK 1.3 or later.  Includes two new fields: <code>startTimeMode</code>
-     * and <code>endTimeMode</code>.
+     * JDK 1.3 or later.  Includes two new fields: {@code startTimeMode}
+     * and {@code endTimeMode}.
      * </dd>
      * </dl>
      * When streaming out this class, the most recent format
-     * and the highest allowable <code>serialVersionOnStream</code>
+     * and the highest allowable {@code serialVersionOnStream}
      * is written.
      * @serial
      * @since 1.1.4
@@ -1625,16 +1625,16 @@
      * Save the state of this object to a stream (i.e., serialize it).
      *
      * @serialData We write out two formats, a JDK 1.1 compatible format, using
-     * <code>DOW_IN_MONTH_MODE</code> rules, in the required section, followed
+     * {@code DOW_IN_MONTH_MODE} rules, in the required section, followed
      * by the full rules, in packed format, in the optional section.  The
      * optional section will be ignored by JDK 1.1 code upon stream in.
      * <p> Contents of the optional section: The length of a byte array is
      * emitted (int); this is 4 as of this release. The byte array of the given
      * length is emitted. The contents of the byte array are the true values of
-     * the fields <code>startDay</code>, <code>startDayOfWeek</code>,
-     * <code>endDay</code>, and <code>endDayOfWeek</code>.  The values of these
+     * the fields {@code startDay}, {@code startDayOfWeek},
+     * {@code endDay}, and {@code endDayOfWeek}.  The values of these
      * fields in the required section are approximate values suited to the rule
-     * mode <code>DOW_IN_MONTH_MODE</code>, which is the only mode recognized by
+     * mode {@code DOW_IN_MONTH_MODE}, which is the only mode recognized by
      * JDK 1.1.
      */
     @java.io.Serial
--- a/src/java.base/share/classes/java/util/TimeZone.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/TimeZone.java	Tue Sep 24 09:43:43 2019 +0100
@@ -48,44 +48,44 @@
 import sun.util.locale.provider.TimeZoneNameUtility;
 
 /**
- * <code>TimeZone</code> represents a time zone offset, and also figures out daylight
+ * {@code TimeZone} represents a time zone offset, and also figures out daylight
  * savings.
  *
  * <p>
- * Typically, you get a <code>TimeZone</code> using <code>getDefault</code>
- * which creates a <code>TimeZone</code> based on the time zone where the program
- * is running. For example, for a program running in Japan, <code>getDefault</code>
- * creates a <code>TimeZone</code> object based on Japanese Standard Time.
+ * Typically, you get a {@code TimeZone} using {@code getDefault}
+ * which creates a {@code TimeZone} based on the time zone where the program
+ * is running. For example, for a program running in Japan, {@code getDefault}
+ * creates a {@code TimeZone} object based on Japanese Standard Time.
  *
  * <p>
- * You can also get a <code>TimeZone</code> using <code>getTimeZone</code>
+ * You can also get a {@code TimeZone} using {@code getTimeZone}
  * along with a time zone ID. For instance, the time zone ID for the
  * U.S. Pacific Time zone is "America/Los_Angeles". So, you can get a
- * U.S. Pacific Time <code>TimeZone</code> object with:
+ * U.S. Pacific Time {@code TimeZone} object with:
  * <blockquote><pre>
  * TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles");
  * </pre></blockquote>
- * You can use the <code>getAvailableIDs</code> method to iterate through
+ * You can use the {@code getAvailableIDs} method to iterate through
  * all the supported time zone IDs. You can then choose a
- * supported ID to get a <code>TimeZone</code>.
+ * supported ID to get a {@code TimeZone}.
  * If the time zone you want is not represented by one of the
  * supported IDs, then a custom time zone ID can be specified to
  * produce a TimeZone. The syntax of a custom time zone ID is:
  *
  * <blockquote><pre>
  * <a id="CustomID"><i>CustomID:</i></a>
- *         <code>GMT</code> <i>Sign</i> <i>Hours</i> <code>:</code> <i>Minutes</i>
- *         <code>GMT</code> <i>Sign</i> <i>Hours</i> <i>Minutes</i>
- *         <code>GMT</code> <i>Sign</i> <i>Hours</i>
+ *         {@code GMT} <i>Sign</i> <i>Hours</i> {@code :} <i>Minutes</i>
+ *         {@code GMT} <i>Sign</i> <i>Hours</i> <i>Minutes</i>
+ *         {@code GMT} <i>Sign</i> <i>Hours</i>
  * <i>Sign:</i> one of
- *         <code>+ -</code>
+ *         {@code + -}
  * <i>Hours:</i>
  *         <i>Digit</i>
  *         <i>Digit</i> <i>Digit</i>
  * <i>Minutes:</i>
  *         <i>Digit</i> <i>Digit</i>
  * <i>Digit:</i> one of
- *         <code>0 1 2 3 4 5 6 7 8 9</code>
+ *         {@code 0 1 2 3 4 5 6 7 8 9}
  * </pre></blockquote>
  *
  * <i>Hours</i> must be between 0 to 23 and <i>Minutes</i> must be
@@ -95,22 +95,22 @@
  * The format is locale independent and digits must be taken from the
  * Basic Latin block of the Unicode standard. No daylight saving time
  * transition schedule can be specified with a custom time zone ID. If
- * the specified string doesn't match the syntax, <code>"GMT"</code>
+ * the specified string doesn't match the syntax, {@code "GMT"}
  * is used.
  * <p>
- * When creating a <code>TimeZone</code>, the specified custom time
+ * When creating a {@code TimeZone}, the specified custom time
  * zone ID is normalized in the following syntax:
  * <blockquote><pre>
  * <a id="NormalizedCustomID"><i>NormalizedCustomID:</i></a>
- *         <code>GMT</code> <i>Sign</i> <i>TwoDigitHours</i> <code>:</code> <i>Minutes</i>
+ *         {@code GMT} <i>Sign</i> <i>TwoDigitHours</i> {@code :} <i>Minutes</i>
  * <i>Sign:</i> one of
- *         <code>+ -</code>
+ *         {@code + -}
  * <i>TwoDigitHours:</i>
  *         <i>Digit</i> <i>Digit</i>
  * <i>Minutes:</i>
  *         <i>Digit</i> <i>Digit</i>
  * <i>Digit:</i> one of
- *         <code>0 1 2 3 4 5 6 7 8 9</code>
+ *         {@code 0 1 2 3 4 5 6 7 8 9}
  * </pre></blockquote>
  * For example, TimeZone.getTimeZone("GMT-8").getID() returns "GMT-08:00".
  *
@@ -139,7 +139,7 @@
     }
 
     /**
-     * A style specifier for <code>getDisplayName()</code> indicating
+     * A style specifier for {@code getDisplayName()} indicating
      * a short name, such as "PST."
      * @see #LONG
      * @since 1.2
@@ -147,7 +147,7 @@
     public static final int SHORT = 0;
 
     /**
-     * A style specifier for <code>getDisplayName()</code> indicating
+     * A style specifier for {@code getDisplayName()} indicating
      * a long name, such as "Pacific Standard Time."
      * @see #SHORT
      * @since 1.2
@@ -168,7 +168,7 @@
      * daylight savings. This is the offset to add to UTC to get local time.
      * <p>
      * This method returns a historically correct offset if an
-     * underlying <code>TimeZone</code> implementation subclass
+     * underlying {@code TimeZone} implementation subclass
      * supports historical Daylight Saving Time schedule and GMT
      * offset changes.
      *
@@ -246,7 +246,7 @@
      * Sets the base time zone offset to GMT.
      * This is the offset to add to UTC to get local time.
      * <p>
-     * If an underlying <code>TimeZone</code> implementation subclass
+     * If an underlying {@code TimeZone} implementation subclass
      * supports historical GMT offset changes, the specified GMT
      * offset is set as the latest GMT offset and the difference from
      * the known latest GMT offset value is used to adjust all
@@ -262,7 +262,7 @@
      * affected by daylight saving time, it is called <I>raw
      * offset</I>.
      * <p>
-     * If an underlying <code>TimeZone</code> implementation subclass
+     * If an underlying {@code TimeZone} implementation subclass
      * supports historical GMT offset changes, the method returns the
      * raw offset value of the current date. In Honolulu, for example,
      * its raw offset changed from GMT-10:30 to GMT-10:00 in 1947, and
@@ -376,10 +376,10 @@
      *
      * <p>When looking up a time zone name, the {@linkplain
      * ResourceBundle.Control#getCandidateLocales(String,Locale) default
-     * <code>Locale</code> search path of <code>ResourceBundle</code>} derived
+     * {@code Locale} search path of {@code ResourceBundle}} derived
      * from the specified {@code locale} is used. (No {@linkplain
      * ResourceBundle.Control#getFallbackLocale(String,Locale) fallback
-     * <code>Locale</code>} search is performed.) If a time zone name in any
+     * {@code Locale}} search is performed.) If a time zone name in any
      * {@code Locale} of the search path, including {@link Locale#ROOT}, is
      * found, the name is returned. Otherwise, a string in the
      * <a href="#NormalizedCustomID">normalized custom ID format</a> is returned.
@@ -504,14 +504,14 @@
     public abstract boolean inDaylightTime(Date date);
 
     /**
-     * Gets the <code>TimeZone</code> for the given ID.
+     * Gets the {@code TimeZone} for the given ID.
      *
-     * @param ID the ID for a <code>TimeZone</code>, either an abbreviation
+     * @param ID the ID for a {@code TimeZone}, either an abbreviation
      * such as "PST", a full name such as "America/Los_Angeles", or a custom
      * ID such as "GMT-8:00". Note that the support of abbreviations is
      * for JDK 1.1.x compatibility only and full names should be used.
      *
-     * @return the specified <code>TimeZone</code>, or the GMT zone if the given ID
+     * @return the specified {@code TimeZone}, or the GMT zone if the given ID
      * cannot be understood.
      */
     public static synchronized TimeZone getTimeZone(String ID) {
@@ -733,7 +733,7 @@
      * Returns true if this zone has the same rule and offset as another zone.
      * That is, if this zone differs only in ID, if at all.  Returns false
      * if the other zone is null.
-     * @param other the <code>TimeZone</code> object to be compared with
+     * @param other the {@code TimeZone} object to be compared with
      * @return true if the other zone is not null and is the same as this one,
      * with the possible exception of the ID
      * @since 1.2
@@ -744,9 +744,9 @@
     }
 
     /**
-     * Creates a copy of this <code>TimeZone</code>.
+     * Creates a copy of this {@code TimeZone}.
      *
-     * @return a clone of this <code>TimeZone</code>
+     * @return a clone of this {@code TimeZone}
      */
     public Object clone()
     {
@@ -765,10 +765,10 @@
     // =======================privates===============================
 
     /**
-     * The string identifier of this <code>TimeZone</code>.  This is a
-     * programmatic identifier used internally to look up <code>TimeZone</code>
+     * The string identifier of this {@code TimeZone}.  This is a
+     * programmatic identifier used internally to look up {@code TimeZone}
      * objects from the system table and also to map them to their localized
-     * display names.  <code>ID</code> values are unique in the system
+     * display names.  {@code ID} values are unique in the system
      * table but may not be for dynamically created zones.
      * @serial
      */
--- a/src/java.base/share/classes/java/util/TooManyListenersException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/TooManyListenersException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -27,7 +27,7 @@
 
 /**
  * <p>
- * The <code> TooManyListenersException </code> Exception is used as part of
+ * The {@code  TooManyListenersException } Exception is used as part of
  * the Java Event model to annotate and implement a unicast special case of
  * a multicast Event Source.
  * </p>
--- a/src/java.base/share/classes/java/util/jar/JarEntry.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/jar/JarEntry.java	Tue Sep 24 09:43:43 2019 +0100
@@ -42,11 +42,11 @@
     CodeSigner[] signers;
 
     /**
-     * Creates a new <code>JarEntry</code> for the specified JAR file
+     * Creates a new {@code JarEntry} for the specified JAR file
      * entry name.
      *
      * @param name the JAR file entry name
-     * @throws    NullPointerException if the entry name is <code>null</code>
+     * @throws    NullPointerException if the entry name is {@code null}
      * @throws    IllegalArgumentException if the entry name is longer than
      *            0xFFFF bytes.
      */
@@ -55,20 +55,20 @@
     }
 
     /**
-     * Creates a new <code>JarEntry</code> with fields taken from the
-     * specified <code>ZipEntry</code> object.
-     * @param ze the <code>ZipEntry</code> object to create the
-     *           <code>JarEntry</code> from
+     * Creates a new {@code JarEntry} with fields taken from the
+     * specified {@code ZipEntry} object.
+     * @param ze the {@code ZipEntry} object to create the
+     *           {@code JarEntry} from
      */
     public JarEntry(ZipEntry ze) {
         super(ze);
     }
 
     /**
-     * Creates a new <code>JarEntry</code> with fields taken from the
-     * specified <code>JarEntry</code> object.
+     * Creates a new {@code JarEntry} with fields taken from the
+     * specified {@code JarEntry} object.
      *
-     * @param je the <code>JarEntry</code> to copy
+     * @param je the {@code JarEntry} to copy
      */
     public JarEntry(JarEntry je) {
         this((ZipEntry)je);
@@ -78,11 +78,11 @@
     }
 
     /**
-     * Returns the <code>Manifest</code> <code>Attributes</code> for this
-     * entry, or <code>null</code> if none.
+     * Returns the {@code Manifest} {@code Attributes} for this
+     * entry, or {@code null} if none.
      *
-     * @return the <code>Manifest</code> <code>Attributes</code> for this
-     * entry, or <code>null</code> if none
+     * @return the {@code Manifest} {@code Attributes} for this
+     * entry, or {@code null} if none
      * @throws IOException  if an I/O error has occurred
      */
     public Attributes getAttributes() throws IOException {
@@ -90,11 +90,11 @@
     }
 
     /**
-     * Returns the <code>Certificate</code> objects for this entry, or
-     * <code>null</code> if none. This method can only be called once
-     * the <code>JarEntry</code> has been completely verified by reading
+     * Returns the {@code Certificate} objects for this entry, or
+     * {@code null} if none. This method can only be called once
+     * the {@code JarEntry} has been completely verified by reading
      * from the entry input stream until the end of the stream has been
-     * reached. Otherwise, this method will return <code>null</code>.
+     * reached. Otherwise, this method will return {@code null}.
      *
      * <p>The returned certificate array comprises all the signer certificates
      * that were used to verify this entry. Each signer certificate is
@@ -103,25 +103,25 @@
      * bottom-to-top (i.e., with the signer certificate first and the (root)
      * certificate authority last).
      *
-     * @return the <code>Certificate</code> objects for this entry, or
-     * <code>null</code> if none.
+     * @return the {@code Certificate} objects for this entry, or
+     * {@code null} if none.
      */
     public Certificate[] getCertificates() {
         return certs == null ? null : certs.clone();
     }
 
     /**
-     * Returns the <code>CodeSigner</code> objects for this entry, or
-     * <code>null</code> if none. This method can only be called once
-     * the <code>JarEntry</code> has been completely verified by reading
+     * Returns the {@code CodeSigner} objects for this entry, or
+     * {@code null} if none. This method can only be called once
+     * the {@code JarEntry} has been completely verified by reading
      * from the entry input stream until the end of the stream has been
-     * reached. Otherwise, this method will return <code>null</code>.
+     * reached. Otherwise, this method will return {@code null}.
      *
      * <p>The returned array comprises all the code signers that have signed
      * this entry.
      *
-     * @return the <code>CodeSigner</code> objects for this entry, or
-     * <code>null</code> if none.
+     * @return the {@code CodeSigner} objects for this entry, or
+     * {@code null} if none.
      *
      * @since 1.5
      */
--- a/src/java.base/share/classes/java/util/jar/JarInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/jar/JarInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -31,10 +31,10 @@
 import jdk.internal.util.jar.JarIndex;
 
 /**
- * The <code>JarInputStream</code> class is used to read the contents of
+ * The {@code JarInputStream} class is used to read the contents of
  * a JAR file from any input stream. It extends the class
- * <code>java.util.zip.ZipInputStream</code> with support for reading
- * an optional <code>Manifest</code> entry. The <code>Manifest</code>
+ * {@code java.util.zip.ZipInputStream} with support for reading
+ * an optional {@code Manifest} entry. The {@code Manifest}
  * can be used to store meta-information about the JAR file and its entries.
  *
  * @author  David Connelly
@@ -52,7 +52,7 @@
     private boolean tryManifest;
 
     /**
-     * Creates a new <code>JarInputStream</code> and reads the optional
+     * Creates a new {@code JarInputStream} and reads the optional
      * manifest. If a manifest is present, also attempts to verify
      * the signatures if the JarInputStream is signed.
      * @param in the actual input stream
@@ -63,7 +63,7 @@
     }
 
     /**
-     * Creates a new <code>JarInputStream</code> and reads the optional
+     * Creates a new {@code JarInputStream} and reads the optional
      * manifest. If a manifest is present and verify is true, also attempts
      * to verify the signatures if the JarInputStream is signed.
      *
@@ -116,11 +116,11 @@
     }
 
     /**
-     * Returns the <code>Manifest</code> for this JAR file, or
-     * <code>null</code> if none.
+     * Returns the {@code Manifest} for this JAR file, or
+     * {@code null} if none.
      *
-     * @return the <code>Manifest</code> for this JAR file, or
-     *         <code>null</code> if none.
+     * @return the {@code Manifest} for this JAR file, or
+     *         {@code null} if none.
      */
     public Manifest getManifest() {
         return man;
@@ -181,21 +181,21 @@
 
     /**
      * Reads from the current JAR file entry into an array of bytes.
-     * If <code>len</code> is not zero, the method
+     * If {@code len} is not zero, the method
      * blocks until some input is available; otherwise, no
-     * bytes are read and <code>0</code> is returned.
+     * bytes are read and {@code 0} is returned.
      * If verification has been enabled, any invalid signature
      * on the current entry will be reported at some point before the
      * end of the entry is reached.
      * @param b the buffer into which the data is read
-     * @param off the start offset in the destination array <code>b</code>
+     * @param off the start offset in the destination array {@code b}
      * @param len the maximum number of bytes to read
      * @return the actual number of bytes read, or -1 if the end of the
      *         entry is reached
-     * @throws     NullPointerException If <code>b</code> is <code>null</code>.
-     * @throws     IndexOutOfBoundsException If <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
+     * @throws     NullPointerException If {@code b} is {@code null}.
+     * @throws     IndexOutOfBoundsException If {@code off} is negative,
+     * {@code len} is negative, or {@code len} is greater than
+     * {@code b.length - off}
      * @throws    ZipException if a ZIP file error has occurred
      * @throws    IOException if an I/O error has occurred
      * @throws    SecurityException if any of the jar file entries
@@ -215,13 +215,13 @@
     }
 
     /**
-     * Creates a new <code>JarEntry</code> (<code>ZipEntry</code>) for the
+     * Creates a new {@code JarEntry} ({@code ZipEntry}) for the
      * specified JAR file entry name. The manifest attributes of
      * the specified JAR file entry name will be copied to the new
      * <CODE>JarEntry</CODE>.
      *
      * @param name the name of the JAR/ZIP file entry
-     * @return the <code>JarEntry</code> object just created
+     * @return the {@code JarEntry} object just created
      */
     protected ZipEntry createZipEntry(String name) {
         JarEntry e = new JarEntry(name);
--- a/src/java.base/share/classes/java/util/jar/JarOutputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/jar/JarOutputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -29,11 +29,11 @@
 import java.io.*;
 
 /**
- * The <code>JarOutputStream</code> class is used to write the contents
+ * The {@code JarOutputStream} class is used to write the contents
  * of a JAR file to any output stream. It extends the class
- * <code>java.util.zip.ZipOutputStream</code> with support
- * for writing an optional <code>Manifest</code> entry. The
- * <code>Manifest</code> can be used to specify meta-information about
+ * {@code java.util.zip.ZipOutputStream} with support
+ * for writing an optional {@code Manifest} entry. The
+ * {@code Manifest} can be used to specify meta-information about
  * the JAR file and its entries.
  *
  * @author  David Connelly
@@ -46,12 +46,12 @@
     private static final int JAR_MAGIC = 0xCAFE;
 
     /**
-     * Creates a new <code>JarOutputStream</code> with the specified
-     * <code>Manifest</code>. The manifest is written as the first
+     * Creates a new {@code JarOutputStream} with the specified
+     * {@code Manifest}. The manifest is written as the first
      * entry to the output stream.
      *
      * @param out the actual output stream
-     * @param man the optional <code>Manifest</code>
+     * @param man the optional {@code Manifest}
      * @throws    IOException if an I/O error has occurred
      */
     public JarOutputStream(OutputStream out, Manifest man) throws IOException {
@@ -66,7 +66,7 @@
     }
 
     /**
-     * Creates a new <code>JarOutputStream</code> with no manifest.
+     * Creates a new {@code JarOutputStream} with no manifest.
      * @param out the actual output stream
      * @throws    IOException if an I/O error has occurred
      */
--- a/src/java.base/share/classes/java/util/jar/package-info.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/jar/package-info.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
  *
  * <h2>Package Specification</h2>
  *
- * The <code>java.util.jar</code> package is based on the following
+ * The {@code java.util.jar} package is based on the following
  * specifications:
  *
  * <ul>
--- a/src/java.base/share/classes/java/util/regex/Pattern.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java	Tue Sep 24 09:43:43 2019 +0100
@@ -357,7 +357,7 @@
  * <a href="#UNIX_LINES">d</a> <a href="#MULTILINE">m</a> <a href="#DOTALL">s</a>
  * <a href="#UNICODE_CASE">u</a> <a href="#COMMENTS">x</a> <a href="#UNICODE_CHARACTER_CLASS">U</a>
  * on - off</td></tr>
- * <tr><th style="vertical-align:top; font-weight:normal" id="non_capture_group_flags"><code>(?idmsuxU-idmsuxU:</code><i>X</i>{@code )}&nbsp;&nbsp;</th>
+ * <tr><th style="vertical-align:top; font-weight:normal" id="non_capture_group_flags">{@code (?idmsuxU-idmsuxU:}<i>X</i>{@code )}&nbsp;&nbsp;</th>
  *     <td headers="matches special non_capture_group_flags"><i>X</i>, as a <a href="#cg">non-capturing group</a> with the
  *         given flags <a href="#CASE_INSENSITIVE">i</a> <a href="#UNIX_LINES">d</a>
  * <a href="#MULTILINE">m</a> <a href="#DOTALL">s</a> <a href="#UNICODE_CASE">u</a >
--- a/src/java.base/share/classes/java/util/regex/package-info.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/regex/package-info.java	Tue Sep 24 09:43:43 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
  * interface in order to support matching against characters from a
  * wide variety of input sources. </p>
  *
- * <p> Unless otherwise noted, passing a <code>null</code> argument to a
+ * <p> Unless otherwise noted, passing a {@code null} argument to a
  * method in any class or interface in this package will cause a
  * {@link java.lang.NullPointerException NullPointerException} to be
  * thrown.
--- a/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/spi/CalendarNameProvider.java	Tue Sep 24 09:43:43 2019 +0100
@@ -190,9 +190,9 @@
 
     /**
      * Returns the string representation (display name) of the calendar
-     * <code>field value</code> in the given <code>style</code> and
-     * <code>locale</code>.  If no string representation is
-     * applicable, <code>null</code> is returned.
+     * {@code field value} in the given {@code style} and
+     * {@code locale}.  If no string representation is
+     * applicable, {@code null} is returned.
      *
      * <p>{@code field} is a {@code Calendar} field index, such as {@link
      * Calendar#MONTH}. The time zone fields, {@link Calendar#ZONE_OFFSET} and
--- a/src/java.base/share/classes/java/util/spi/CurrencyNameProvider.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/spi/CurrencyNameProvider.java	Tue Sep 24 09:43:43 2019 +0100
@@ -63,10 +63,10 @@
      * @param locale the desired locale
      * @return the symbol of the given currency code for the specified locale, or null if
      *     the symbol is not available for the locale
-     * @throws    NullPointerException if <code>currencyCode</code> or
-     *     <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>currencyCode</code> is not in
-     *     the form of three upper-case letters, or <code>locale</code> isn't
+     * @throws    NullPointerException if {@code currencyCode} or
+     *     {@code locale} is null
+     * @throws    IllegalArgumentException if {@code currencyCode} is not in
+     *     the form of three upper-case letters, or {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
@@ -84,13 +84,13 @@
      * @param locale the desired locale
      * @return the name for the currency that is appropriate for display to the
      *     user, or null if the name is not available for the locale
-     * @throws    IllegalArgumentException if <code>currencyCode</code> is not in
-     *     the form of three upper-case letters, or <code>locale</code> isn't
+     * @throws    IllegalArgumentException if {@code currencyCode} is not in
+     *     the form of three upper-case letters, or {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
-     * @throws    NullPointerException if <code>currencyCode</code> or
-     *     <code>locale</code> is <code>null</code>
+     * @throws    NullPointerException if {@code currencyCode} or
+     *     {@code locale} is {@code null}
      * @since 1.7
      */
     public String getDisplayName(String currencyCode, Locale locale) {
--- a/src/java.base/share/classes/java/util/spi/LocaleNameProvider.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/spi/LocaleNameProvider.java	Tue Sep 24 09:43:43 2019 +0100
@@ -48,10 +48,10 @@
      * Returns a localized name for the given <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
      * IETF BCP47</a> language code and the given locale that is appropriate for
      * display to the user.
-     * For example, if <code>languageCode</code> is "fr" and <code>locale</code>
-     * is en_US, getDisplayLanguage() will return "French"; if <code>languageCode</code>
-     * is "en" and <code>locale</code> is fr_FR, getDisplayLanguage() will return "anglais".
-     * If the name returned cannot be localized according to <code>locale</code>,
+     * For example, if {@code languageCode} is "fr" and {@code locale}
+     * is en_US, getDisplayLanguage() will return "French"; if {@code languageCode}
+     * is "en" and {@code locale} is fr_FR, getDisplayLanguage() will return "anglais".
+     * If the name returned cannot be localized according to {@code locale},
      * (say, the provider does not have a Japanese name for Croatian),
      * this method returns null.
      * @param languageCode the language code string in the form of two to eight
@@ -59,9 +59,9 @@
      * @param locale the desired locale
      * @return the name of the given language code for the specified locale, or null if it's not
      *     available.
-     * @throws    NullPointerException if <code>languageCode</code> or <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>languageCode</code> is not in the form of
-     *     two or three lower-case letters, or <code>locale</code> isn't
+     * @throws    NullPointerException if {@code languageCode} or {@code locale} is null
+     * @throws    IllegalArgumentException if {@code languageCode} is not in the form of
+     *     two or three lower-case letters, or {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
@@ -73,10 +73,10 @@
      * Returns a localized name for the given <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
      * IETF BCP47</a> script code and the given locale that is appropriate for
      * display to the user.
-     * For example, if <code>scriptCode</code> is "Latn" and <code>locale</code>
-     * is en_US, getDisplayScript() will return "Latin"; if <code>scriptCode</code>
-     * is "Cyrl" and <code>locale</code> is fr_FR, getDisplayScript() will return "cyrillique".
-     * If the name returned cannot be localized according to <code>locale</code>,
+     * For example, if {@code scriptCode} is "Latn" and {@code locale}
+     * is en_US, getDisplayScript() will return "Latin"; if {@code scriptCode}
+     * is "Cyrl" and {@code locale} is fr_FR, getDisplayScript() will return "cyrillique".
+     * If the name returned cannot be localized according to {@code locale},
      * (say, the provider does not have a Japanese name for Cyrillic),
      * this method returns null. The default implementation returns null.
      * @param scriptCode the four letter script code string in the form of title-case
@@ -86,9 +86,9 @@
      * @param locale the desired locale
      * @return the name of the given script code for the specified locale, or null if it's not
      *     available.
-     * @throws    NullPointerException if <code>scriptCode</code> or <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>scriptCode</code> is not in the form of
-     *     four title case letters, or <code>locale</code> isn't
+     * @throws    NullPointerException if {@code scriptCode} or {@code locale} is null
+     * @throws    IllegalArgumentException if {@code scriptCode} is not in the form of
+     *     four title case letters, or {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
@@ -103,10 +103,10 @@
      * Returns a localized name for the given <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
      * IETF BCP47</a> region code (either ISO 3166 country code or UN M.49 area
      * codes) and the given locale that is appropriate for display to the user.
-     * For example, if <code>countryCode</code> is "FR" and <code>locale</code>
-     * is en_US, getDisplayCountry() will return "France"; if <code>countryCode</code>
-     * is "US" and <code>locale</code> is fr_FR, getDisplayCountry() will return "Etats-Unis".
-     * If the name returned cannot be localized according to <code>locale</code>,
+     * For example, if {@code countryCode} is "FR" and {@code locale}
+     * is en_US, getDisplayCountry() will return "France"; if {@code countryCode}
+     * is "US" and {@code locale} is fr_FR, getDisplayCountry() will return "Etats-Unis".
+     * If the name returned cannot be localized according to {@code locale},
      * (say, the provider does not have a Japanese name for Croatia),
      * this method returns null.
      * @param countryCode the country(region) code string in the form of two
@@ -115,9 +115,9 @@
      * @param locale the desired locale
      * @return the name of the given country code for the specified locale, or null if it's not
      *     available.
-     * @throws    NullPointerException if <code>countryCode</code> or <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>countryCode</code> is not in the form of
-     *     two upper-case letters or three digit letters, or <code>locale</code> isn't
+     * @throws    NullPointerException if {@code countryCode} or {@code locale} is null
+     * @throws    IllegalArgumentException if {@code countryCode} is not in the form of
+     *     two upper-case letters or three digit letters, or {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
@@ -128,14 +128,14 @@
     /**
      * Returns a localized name for the given variant code and the given locale that
      * is appropriate for display to the user.
-     * If the name returned cannot be localized according to <code>locale</code>,
+     * If the name returned cannot be localized according to {@code locale},
      * this method returns null.
      * @param variant the variant string
      * @param locale the desired locale
      * @return the name of the given variant string for the specified locale, or null if it's not
      *     available.
-     * @throws    NullPointerException if <code>variant</code> or <code>locale</code> is null
-     * @throws    IllegalArgumentException if <code>locale</code> isn't
+     * @throws    NullPointerException if {@code variant} or {@code locale} is null
+     * @throws    IllegalArgumentException if {@code locale} isn't
      *     one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
--- a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java	Tue Sep 24 09:43:43 2019 +0100
@@ -33,12 +33,12 @@
  * interfaces (SPIs).
  * <p>
  * Locale sensitive  service provider interfaces are interfaces that
- * correspond to locale sensitive classes in the <code>java.text</code>
- * and <code>java.util</code> packages. The interfaces enable the
+ * correspond to locale sensitive classes in the {@code java.text}
+ * and {@code java.util} packages. The interfaces enable the
  * construction of locale sensitive objects and the retrieval of
  * localized names for these packages. Locale sensitive factory methods
- * and methods for name retrieval in the <code>java.text</code> and
- * <code>java.util</code> packages use implementations of the provider
+ * and methods for name retrieval in the {@code java.text} and
+ * {@code java.util} packages use implementations of the provider
  * interfaces to offer support for locales beyond the set of locales
  * supported by the Java runtime environment itself.
  *
@@ -68,17 +68,17 @@
  * <pre>
  * META-INF/services/java.text.spi.DateFormatProvider
  * </pre>
- * And the file <code>java.text.spi.DateFormatProvider</code> should have
+ * And the file {@code java.text.spi.DateFormatProvider} should have
  * a line such as:
  * <pre>
- * <code>com.foo.DateFormatProviderImpl</code>
+ * {@code com.foo.DateFormatProviderImpl}
  * </pre>
  * which is the fully qualified class name of the class implementing
- * <code>DateFormatProvider</code>.
+ * {@code DateFormatProvider}.
  * <h3>Invocation of Locale Sensitive Services</h3>
  * <p>
  * Locale sensitive factory methods and methods for name retrieval in the
- * <code>java.text</code> and <code>java.util</code> packages invoke
+ * {@code java.text} and {@code java.util} packages invoke
  * service provider methods when needed to support the requested locale.
  * The methods first check whether the Java runtime environment itself
  * supports the requested locale, and use its support if available.
@@ -93,7 +93,7 @@
  * supports the requested locale, the methods go through a list of candidate
  * locales and repeat the availability check for each until a match is found.
  * The algorithm used for creating a list of candidate locales is same as
- * the one used by <code>ResourceBundle</code> by default (see
+ * the one used by {@code ResourceBundle} by default (see
  * {@link java.util.ResourceBundle.Control#getCandidateLocales getCandidateLocales}
  * for the details).  Even if a locale is resolved from the candidate list,
  * methods that return requested objects or names are invoked with the original
@@ -104,7 +104,7 @@
  * Providers of names (but not providers of other objects) are allowed to
  * return null for some name requests even for locales that they claim to
  * support by including them in their return value for
- * <code>getAvailableLocales</code>. Similarly, the Java runtime
+ * {@code getAvailableLocales}. Similarly, the Java runtime
  * environment itself may not have all names for all locales that it
  * supports. This is because the sets of objects for which names are
  * requested can be large and vary over time, so that it's not always
--- a/src/java.base/share/classes/java/util/spi/TimeZoneNameProvider.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/spi/TimeZoneNameProvider.java	Tue Sep 24 09:43:43 2019 +0100
@@ -57,7 +57,7 @@
      * "tzdata", and the specification of the data format is part of the zic.8
      * man page, which is contained in a file whose name starts with "tzcode".
      * <p>
-     * If <code>daylight</code> is true, the method should return a name
+     * If {@code daylight} is true, the method should return a name
      * appropriate for daylight saving time even if the specified time zone
      * has not observed daylight saving time in the past.
      *
@@ -68,11 +68,11 @@
      * @param locale the desired locale
      * @return the human-readable name of the given time zone in the
      *     given locale, or null if it's not available.
-     * @throws    IllegalArgumentException if <code>style</code> is invalid,
-     *     or <code>locale</code> isn't one of the locales returned from
+     * @throws    IllegalArgumentException if {@code style} is invalid,
+     *     or {@code locale} isn't one of the locales returned from
      *     {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
-     * @throws    NullPointerException if <code>ID</code> or <code>locale</code>
+     * @throws    NullPointerException if {@code ID} or {@code locale}
      *     is null
      * @see java.util.TimeZone#getDisplayName(boolean, int, java.util.Locale)
      */
@@ -96,11 +96,11 @@
      * @param locale the desired locale
      * @return the human-readable generic name of the given time zone in the
      *     given locale, or {@code null} if it's not available.
-     * @throws    IllegalArgumentException if <code>style</code> is invalid,
-     *     or <code>locale</code> isn't one of the locales returned from
+     * @throws    IllegalArgumentException if {@code style} is invalid,
+     *     or {@code locale} isn't one of the locales returned from
      *     {@link LocaleServiceProvider#getAvailableLocales()
      *     getAvailableLocales()}.
-     * @throws    NullPointerException if <code>ID</code> or <code>locale</code>
+     * @throws    NullPointerException if {@code ID} or {@code locale}
      *     is {@code null}
      * @since 1.8
      */
--- a/src/java.base/share/classes/java/util/zip/CheckedInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/zip/CheckedInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -65,18 +65,18 @@
     }
 
     /**
-     * Reads into an array of bytes. If <code>len</code> is not zero, the method
+     * Reads into an array of bytes. If {@code len} is not zero, the method
      * blocks until some input is available; otherwise, no
-     * bytes are read and <code>0</code> is returned.
+     * bytes are read and {@code 0} is returned.
      * @param buf the buffer into which the data is read
-     * @param off the start offset in the destination array <code>b</code>
+     * @param off the start offset in the destination array {@code b}
      * @param len the maximum number of bytes read
      * @return    the actual number of bytes read, or -1 if the end
      *            of the stream is reached.
-     * @throws     NullPointerException If <code>buf</code> is <code>null</code>.
-     * @throws     IndexOutOfBoundsException If <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>buf.length - off</code>
+     * @throws     NullPointerException If {@code buf} is {@code null}.
+     * @throws     IndexOutOfBoundsException If {@code off} is negative,
+     * {@code len} is negative, or {@code len} is greater than
+     * {@code buf.length - off}
      * @throws    IOException if an I/O error has occurred
      */
     public int read(byte[] buf, int off, int len) throws IOException {
--- a/src/java.base/share/classes/java/util/zip/GZIPInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/zip/GZIPInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -93,19 +93,19 @@
     }
 
     /**
-     * Reads uncompressed data into an array of bytes. If <code>len</code> is not
+     * Reads uncompressed data into an array of bytes. If {@code len} is not
      * zero, the method will block until some input can be decompressed; otherwise,
-     * no bytes are read and <code>0</code> is returned.
+     * no bytes are read and {@code 0} is returned.
      * @param buf the buffer into which the data is read
-     * @param off the start offset in the destination array <code>b</code>
+     * @param off the start offset in the destination array {@code b}
      * @param len the maximum number of bytes read
      * @return  the actual number of bytes read, or -1 if the end of the
      *          compressed input stream is reached
      *
-     * @throws     NullPointerException If <code>buf</code> is <code>null</code>.
-     * @throws     IndexOutOfBoundsException If <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>buf.length - off</code>
+     * @throws     NullPointerException If {@code buf} is {@code null}.
+     * @throws     IndexOutOfBoundsException If {@code off} is negative,
+     * {@code len} is negative, or {@code len} is greater than
+     * {@code buf.length - off}
      * @throws    ZipException if the compressed input data is corrupt.
      * @throws    IOException if an I/O error has occurred.
      *
--- a/src/java.base/share/classes/java/util/zip/InflaterInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/zip/InflaterInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -124,18 +124,18 @@
     }
 
     /**
-     * Reads uncompressed data into an array of bytes. If <code>len</code> is not
+     * Reads uncompressed data into an array of bytes. If {@code len} is not
      * zero, the method will block until some input can be decompressed; otherwise,
-     * no bytes are read and <code>0</code> is returned.
+     * no bytes are read and {@code 0} is returned.
      * @param b the buffer into which the data is read
-     * @param off the start offset in the destination array <code>b</code>
+     * @param off the start offset in the destination array {@code b}
      * @param len the maximum number of bytes read
      * @return the actual number of bytes read, or -1 if the end of the
      *         compressed input is reached or a preset dictionary is needed
-     * @throws     NullPointerException If <code>b</code> is <code>null</code>.
-     * @throws     IndexOutOfBoundsException If <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
+     * @throws     NullPointerException If {@code b} is {@code null}.
+     * @throws     IndexOutOfBoundsException If {@code off} is negative,
+     * {@code len} is negative, or {@code len} is greater than
+     * {@code b.length - off}
      * @throws    ZipException if a ZIP format error has occurred
      * @throws    IOException if an I/O error has occurred
      */
@@ -248,13 +248,13 @@
     }
 
     /**
-     * Tests if this input stream supports the <code>mark</code> and
-     * <code>reset</code> methods. The <code>markSupported</code>
-     * method of <code>InflaterInputStream</code> returns
-     * <code>false</code>.
+     * Tests if this input stream supports the {@code mark} and
+     * {@code reset} methods. The {@code markSupported}
+     * method of {@code InflaterInputStream} returns
+     * {@code false}.
      *
-     * @return  a <code>boolean</code> indicating if this stream type supports
-     *          the <code>mark</code> and <code>reset</code> methods.
+     * @return  a {@code boolean} indicating if this stream type supports
+     *          the {@code mark} and {@code reset} methods.
      * @see     java.io.InputStream#mark(int)
      * @see     java.io.InputStream#reset()
      */
@@ -265,7 +265,7 @@
     /**
      * Marks the current position in this input stream.
      *
-     * <p> The <code>mark</code> method of <code>InflaterInputStream</code>
+     * <p> The {@code mark} method of {@code InflaterInputStream}
      * does nothing.
      *
      * @param   readlimit   the maximum limit of bytes that can be read before
@@ -277,11 +277,11 @@
 
     /**
      * Repositions this stream to the position at the time the
-     * <code>mark</code> method was last called on this input stream.
+     * {@code mark} method was last called on this input stream.
      *
-     * <p> The method <code>reset</code> for class
-     * <code>InflaterInputStream</code> does nothing except throw an
-     * <code>IOException</code>.
+     * <p> The method {@code reset} for class
+     * {@code InflaterInputStream} does nothing except throw an
+     * {@code IOException}.
      *
      * @throws     IOException  if this method is invoked.
      * @see     java.io.InputStream#mark(int)
--- a/src/java.base/share/classes/java/util/zip/ZipException.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/zip/ZipException.java	Tue Sep 24 09:43:43 2019 +0100
@@ -41,7 +41,7 @@
     private static final long serialVersionUID = 8000196834066748623L;
 
     /**
-     * Constructs a <code>ZipException</code> with <code>null</code>
+     * Constructs a {@code ZipException} with {@code null}
      * as its error detail message.
      */
     public ZipException() {
@@ -49,7 +49,7 @@
     }
 
     /**
-     * Constructs a <code>ZipException</code> with the specified detail
+     * Constructs a {@code ZipException} with the specified detail
      * message.
      *
      * @param   s   the detail message.
--- a/src/java.base/share/classes/java/util/zip/ZipInputStream.java	Tue Sep 24 10:04:13 2019 +0000
+++ b/src/java.base/share/classes/java/util/zip/ZipInputStream.java	Tue Sep 24 09:43:43 2019 +0100
@@ -164,18 +164,18 @@
 
     /**
      * Reads from the current ZIP entry into an array of bytes.
-     * If <code>len</code> is not zero, the method
+     * If {@code len} is not zero, the method
      * blocks until some input is available; otherwise, no
-     * bytes are read and <code>0</code> is returned.
+     * bytes are read and {@code 0} is returned.
      * @param b the buffer into which the data is read
-     * @param off the start offset in the destination array <code>b</code>
+     * @param off the start offset in the destination array {@code b}
      * @param len the maximum number of bytes read
      * @return the actual number of bytes read, or -1 if the end of the
      *         entry is reached
-     * @throws     NullPointerException if <code>b</code> is <code>null</code>.
-     * @throws     IndexOutOfBoundsException if <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
+     * @throws     NullPointerException if {@code b} is {@code null}.
+     * @throws     IndexOutOfBoundsException if {@code off} is negative,
+     * {@code len} is negative, or {@code len} is greater than
+     * {@code b.length - off}
      * @throws    ZipException if a ZIP file error has occurred
      * @throws    IOException if an I/O error has occurred
      */
@@ -327,7 +327,7 @@
     }
 
     /**
-     * Creates a new <code>ZipEntry</code> object for the specified
+     * Creates a new {@code ZipEntry} object for the specified
      * entry name.
      *
      * @param name the ZIP file entry name