From dcff47f86b5822106c3a4a8ef0ab495c96dcf4d0 Mon Sep 17 00:00:00 2001 From: Mihai Nita Date: Wed, 19 Mar 2025 17:26:29 -0700 Subject: [PATCH] ICU-23040 Fix invalid html5 tags and attributes --- .../java/com/ibm/icu/text/CollationKey.java | 4 +- .../main/java/com/ibm/icu/text/Collator.java | 6 +- .../java/com/ibm/icu/text/SearchIterator.java | 34 +- .../java/com/ibm/icu/text/StringSearch.java | 16 +- .../com/ibm/icu/impl/CalendarAstronomer.java | 8 +- .../java/com/ibm/icu/impl/IntTrieBuilder.java | 2 +- .../java/com/ibm/icu/impl/TrieBuilder.java | 2 +- .../com/ibm/icu/impl/UnicodeMapIterator.java | 64 +- .../java/com/ibm/icu/math/BigDecimal.java | 10 +- .../java/com/ibm/icu/text/BreakIterator.java | 6 +- .../com/ibm/icu/text/ComposedCharIter.java | 24 +- .../com/ibm/icu/text/DateFormatSymbols.java | 6 +- .../ibm/icu/text/DecimalFormatSymbols.java | 6 +- .../java/com/ibm/icu/text/MessageFormat.java | 6 +- .../java/com/ibm/icu/text/Normalizer.java | 80 +-- .../java/com/ibm/icu/text/NumberFormat.java | 4 +- .../java/com/ibm/icu/text/PluralRules.java | 10 +- .../com/ibm/icu/text/SimpleDateFormat.java | 5 +- .../java/com/ibm/icu/text/SymbolTable.java | 4 +- .../main/java/com/ibm/icu/text/UFormat.java | 8 +- .../com/ibm/icu/text/UnicodeCompressor.java | 18 +- .../com/ibm/icu/text/UnicodeDecompressor.java | 4 +- .../java/com/ibm/icu/text/UnicodeFilter.java | 6 +- .../java/com/ibm/icu/text/UnicodeMatcher.java | 2 +- .../java/com/ibm/icu/text/UnicodeSet.java | 32 +- .../com/ibm/icu/text/UnicodeSetIterator.java | 64 +- .../java/com/ibm/icu/util/BasicTimeZone.java | 4 +- .../main/java/com/ibm/icu/util/Calendar.java | 54 +- .../com/ibm/icu/util/CompactByteArray.java | 2 +- .../com/ibm/icu/util/CompactCharArray.java | 2 +- .../main/java/com/ibm/icu/util/Currency.java | 8 +- .../java/com/ibm/icu/util/HebrewCalendar.java | 4 +- .../com/ibm/icu/util/StringTokenizer.java | 16 +- .../main/java/com/ibm/icu/util/ULocale.java | 10 +- .../resources/com/ibm/icu/lang/package.html | 3 +- .../ibm/icu/text/CompoundTransliterator.java | 6 +- .../java/com/ibm/icu/text/Transliterator.java | 20 +- .../icu/dev/test/translit/WriteCharts.java | 14 +- icu4j/pom.xml | 4 +- icu4j/stylesheet8.css | 578 ------------------ 40 files changed, 288 insertions(+), 868 deletions(-) delete mode 100644 icu4j/stylesheet8.css diff --git a/icu4j/main/collate/src/main/java/com/ibm/icu/text/CollationKey.java b/icu4j/main/collate/src/main/java/com/ibm/icu/text/CollationKey.java index fab084f7c39..d47676dc5de 100644 --- a/icu4j/main/collate/src/main/java/com/ibm/icu/text/CollationKey.java +++ b/icu4j/main/collate/src/main/java/com/ibm/icu/text/CollationKey.java @@ -387,7 +387,7 @@ public final class CollationKey implements Comparable * src/com/ibm/icu/dev/test/collator/CollationAPITest/TestBounds. * *

- * Collation keys produced may be compared using the compare API. + * Collation keys produced may be compared using the {@code compare} API. * @param boundType Mode of bound required. It can be BoundMode.LOWER, which * produces a lower inclusive bound, BoundMode.UPPER, that * produces upper bound that matches strings of the same @@ -510,7 +510,7 @@ public final class CollationKey implements Comparable * @param source CollationKey to merge with * @return a CollationKey that contains the valid merged sort keys * with a null String representation, - * i.e. new CollationKey(null, merged_sort_keys) + * i.e. {@code new CollationKey(null, merged_sort_keys)} * @exception IllegalArgumentException thrown if source CollationKey * argument is null or of 0 length. * @stable ICU 2.6 diff --git a/icu4j/main/collate/src/main/java/com/ibm/icu/text/Collator.java b/icu4j/main/collate/src/main/java/com/ibm/icu/text/Collator.java index f3db746d070..8743b82db36 100644 --- a/icu4j/main/collate/src/main/java/com/ibm/icu/text/Collator.java +++ b/icu4j/main/collate/src/main/java/com/ibm/icu/text/Collator.java @@ -1487,9 +1487,9 @@ public abstract class Collator implements Comparator, Freezableen_US_CALIFORNIA, the actual data may be - * drawn from en (the actual locale), and - * en_US may be the most specific locale that exists (the + * for locale {@code en_US_CALIFORNIA}, the actual data may be + * drawn from {@code en} (the actual locale), and + * {@code en_US} may be the most specific locale that exists (the * valid locale). * *

Note: This method will be implemented in ICU 3.0; ICU 2.8 diff --git a/icu4j/main/collate/src/main/java/com/ibm/icu/text/SearchIterator.java b/icu4j/main/collate/src/main/java/com/ibm/icu/text/SearchIterator.java index cd67af64c6a..d0d3589e2b7 100644 --- a/icu4j/main/collate/src/main/java/com/ibm/icu/text/SearchIterator.java +++ b/icu4j/main/collate/src/main/java/com/ibm/icu/text/SearchIterator.java @@ -12,27 +12,27 @@ package com.ibm.icu.text; import java.text.CharacterIterator; /** - * SearchIterator is an abstract base class that provides + * {@code SearchIterator} is an abstract base class that provides * methods to search for a pattern within a text string. Instances of - * SearchIterator maintain a current position and scan over the + * {@code SearchIterator} maintain a current position and scan over the * target text, returning the indices the pattern is matched and the length * of each match. *

- * SearchIterator defines a protocol for text searching. + * {@code SearchIterator} defines a protocol for text searching. * Subclasses provide concrete implementations of various search algorithms. - * For example, StringSearch implements language-sensitive pattern + * For example, {@code StringSearch} implements language-sensitive pattern * matching based on the comparison rules defined in a - * RuleBasedCollator object. + * {@code RuleBasedCollator} object. *

* Other options for searching include using a BreakIterator to restrict * the points at which matches are detected. *

- * SearchIterator provides an API that is similar to that of - * other text iteration classes such as BreakIterator. Using + * {@code SearchIterator} provides an API that is similar to that of + * other text iteration classes such as {@code BreakIterator}. Using * this class, it is easy to scan through text looking for all occurrences of - * a given pattern. The following example uses a StringSearch + * a given pattern. The following example uses a {@code StringSearch} * object to find all instances of "fox" in the target string. Any other - * subclass of SearchIterator can be used in an identical + * subclass of {@code SearchIterator} can be used in an identical * manner. * 


  * String target = "The quick brown fox jumped over the lazy fox";
@@ -220,7 +220,7 @@ public abstract class SearchIterator
      *                found, but the match's start or end index is not a 
      *                boundary as determined by the {@link BreakIterator}, 
      *                the match will be rejected and another will be searched 
-     *                for. If this parameter is null, no break
+     *                for. If this parameter is {@code null}, no break
      *                detection is attempted.
      * @see BreakIterator
      * @stable ICU 2.0
@@ -329,7 +329,7 @@ public abstract class SearchIterator
      * Returns the BreakIterator that is used to restrict the indexes at which 
      * matches are detected. This will be the same object that was passed to 
      * the constructor or to {@link #setBreakIterator}.
-     * If the {@link BreakIterator} has not been set, null will be returned.
+     * If the {@link BreakIterator} has not been set, {@code null} will be returned.
      * See {@link #setBreakIterator} for more information.
      * 
      * @return the BreakIterator set to restrict logic matches
@@ -546,7 +546,7 @@ public abstract class SearchIterator
     }
 
     /**
-     * Returns the first index equal or greater than position at which the 
+     * Returns the first index equal or greater than {@code position} at which the 
      * string text matches the search pattern. The iterator is adjusted so 
      * that its current index (as returned by {@link #getIndex()}) is the 
      * match position if one was found.
@@ -555,7 +555,7 @@ public abstract class SearchIterator
      * 
      * @param  position where search if to start from.
      * @return The character index of the first match following 
-     *         position, or {@link #DONE} if there are no matches.
+     *         {@code position}, or {@link #DONE} if there are no matches.
      * @throws IndexOutOfBoundsException    If position is less than or greater
      *      than the text range for searching.
      * @see #getIndex
@@ -586,7 +586,7 @@ public abstract class SearchIterator
     }
 
     /**
-     * Returns the first index less than position at which the string 
+     * Returns the first index less than {@code position} at which the string 
      * text matches the search pattern. The iterator is adjusted so that its 
      * current index (as returned by {@link #getIndex}) is the match 
      * position if one was found. If a match is not found, 
@@ -594,13 +594,13 @@ public abstract class SearchIterator
      * adjusted to the index {@link #DONE}
      * 

      * When the overlapping option ({@link #isOverlapping}) is off, the last index of the
-     * result match is always less than position.
+     * result match is always less than {@code position}.
      * When the overlapping option is on, the result match may span across
-     * position.
+     * {@code position}.
      *
      * @param  position where search is to start from.
      * @return The character index of the first match preceding 
-     *         position, or {@link #DONE} if there are 
+     *         {@code position}, or {@link #DONE} if there are 
      *         no matches.
      * @throws IndexOutOfBoundsException If position is less than or greater than
      *                                   the text range for searching
diff --git a/icu4j/main/collate/src/main/java/com/ibm/icu/text/StringSearch.java b/icu4j/main/collate/src/main/java/com/ibm/icu/text/StringSearch.java
index 8e6e959929d..ce3c834b99a 100644
--- a/icu4j/main/collate/src/main/java/com/ibm/icu/text/StringSearch.java
+++ b/icu4j/main/collate/src/main/java/com/ibm/icu/text/StringSearch.java
@@ -34,7 +34,7 @@ import com.ibm.icu.util.ULocale;
 
 /**
  *
- * StringSearch is a {@link SearchIterator} that provides
+ * {@code StringSearch} is a {@link SearchIterator} that provides
  * language-sensitive text searching based on the comparison rules defined
  * in a {@link RuleBasedCollator} object.
  * StringSearch ensures that language eccentricity can be
@@ -107,20 +107,20 @@ import com.ibm.icu.util.ULocale;
  * performing matches, there are no APIs here for setting and getting the
  * attributes. These attributes can be set by getting the collator
  * from {@link #getCollator} and using the APIs in {@link RuleBasedCollator}.
- * Lastly to update StringSearch to the new collator attributes,
+ * Lastly to update {@code StringSearch} to the new collator attributes,
  * {@link #reset} has to be called.
  * 

  * Restriction: 

  * Currently there are no composite characters that consists of a
  * character with combining class > 0 before a character with combining
  * class == 0. However, if such a character exists in the future,
- * StringSearch does not guarantee the results for option 1.
+ * {@code StringSearch} does not guarantee the results for option 1.
  * 

  * Consult the {@link SearchIterator} documentation for information on
  * and examples of how to use instances of this class to implement text
  * searching.
  * 

- * Note, StringSearch is not to be subclassed.
+ * Note, {@code StringSearch} is not to be subclassed.
  * 

  * @see SearchIterator
  * @see RuleBasedCollator
@@ -290,12 +290,12 @@ public final class StringSearch extends SearchIterator {
     /**
      * Gets the {@link RuleBasedCollator} used for the language rules.
      * 

-     * Since StringSearch depends on the returned {@link RuleBasedCollator}, any
+     * Since {@code StringSearch} depends on the returned {@link RuleBasedCollator}, any
      * changes to the {@link RuleBasedCollator} result should follow with a call to
      * either {@link #reset()} or {@link #setCollator(RuleBasedCollator)} to ensure the correct
      * search behavior.
      * 

-     * @return {@link RuleBasedCollator} used by this StringSearch
+     * @return {@link RuleBasedCollator} used by this {@code StringSearch}
      * @see RuleBasedCollator
      * @see #setCollator
      * @stable ICU 2.0
@@ -308,7 +308,7 @@ public final class StringSearch extends SearchIterator {
      * Sets the {@link RuleBasedCollator} to be used for language-specific searching.
      * 

      * The iterator's position will not be changed by this method.
-     * @param collator to use for this StringSearch
+     * @param collator to use for this {@code StringSearch}
      * @throws IllegalArgumentException thrown when collator is null
      * @see #getCollator
      * @stable ICU 2.0
@@ -334,7 +334,7 @@ public final class StringSearch extends SearchIterator {
     }
 
     /**
-     * Returns the pattern for which StringSearch is searching for.
+     * Returns the pattern for which {@code StringSearch} is searching for.
      * @return the pattern searched for
      * @stable ICU 2.0
      */
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/CalendarAstronomer.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/CalendarAstronomer.java
index a6d98e297e0..bb83ad182c3 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/CalendarAstronomer.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/CalendarAstronomer.java
@@ -615,8 +615,8 @@ public class CalendarAstronomer {
      * longitude will have the desired value.
      * 

      * @param desired   The desired longitude.
-     * @param next      true if the next occurrance of the phase
-     *                  is desired, false for the previous occurrance.
+     * @param next      {@code true} if the next occurrance of the phase
+     *                  is desired, {@code false} for the previous occurrance.
      * @internal
      */
     public long getMoonTime(double desired, boolean next)
@@ -635,8 +635,8 @@ public class CalendarAstronomer {
      * desired phase.
      * 

      * @param desired   The desired phase of the moon.
-     * @param next      true if the next occurrance of the phase
-     *                  is desired, false for the previous occurrance.
+     * @param next      {@code true} if the next occurrance of the phase
+     *                  is desired, {@code false} for the previous occurrance.
      * @internal
      */
     public long getMoonTime(MoonAge desired, boolean next) {
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/IntTrieBuilder.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/IntTrieBuilder.java
index 4108f3def4f..b60910cc395 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/IntTrieBuilder.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/IntTrieBuilder.java
@@ -27,7 +27,7 @@ import com.ibm.icu.text.UTF16;
  * when you have a lot of redundance, such as where all 21,000 Han ideographs 
  * have the same value.  However, lookup is much faster than a hash table.
  * A trie of any primitive data type serves two purposes:
- * 
    
+ * 
      
  *     
    • Fast access of the indexed values.
  *     
    • Smaller memory footprint.
  * 
    
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/TrieBuilder.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/TrieBuilder.java
index ff60a10567e..d3151b4fcb1 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/TrieBuilder.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/TrieBuilder.java
@@ -23,7 +23,7 @@ import com.ibm.icu.lang.UCharacter;
  * when you have a lot of redundance, such as where all 21,000 Han ideographs 
  * have the same value.  However, lookup is much faster than a hash table.
  * A trie of any primitive data type serves two purposes:
- * 
      
+ * 
        
  *     
      • Fast access of the indexed values.
  *     
      • Smaller memory footprint.
  * 
      
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/UnicodeMapIterator.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/UnicodeMapIterator.java
index 8923bc5ee9c..043a18df9b0 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/UnicodeMapIterator.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/UnicodeMapIterator.java
@@ -49,32 +49,32 @@ import com.ibm.icu.text.UTF16;
 public class UnicodeMapIterator {
 
     /**
-     * Value of codepoint if the iterator points to a string.
-     * If codepoint == IS_STRING, then examine
-     * string for the current iteration result.
+     * Value of {@code codepoint} if the iterator points to a string.
+     * If {@code codepoint == IS_STRING}, then examine
+     * {@code string} for the current iteration result.
      */
     public static int IS_STRING = -1;
 
     /**
-     * Current code point, or the special value IS_STRING, if
+     * Current code point, or the special value {@code IS_STRING}, if
      * the iterator points to a string.
      */
     public int codepoint;
 
     /**
-     * When iterating over ranges using nextRange(),
-     * codepointEnd contains the inclusive end of the
-     * iteration range, if codepoint != IS_STRING.  If
-     * iterating over code points using next(), or if
-     * codepoint == IS_STRING, then the value of
-     * codepointEnd is undefined.
+     * When iterating over ranges using {@code nextRange()},
+     * {@code codepointEnd} contains the inclusive end of the
+     * iteration range, if {@code codepoint != IS_STRING}.  If
+     * iterating over code points using {@code next()}, or if
+     * {@code codepoint == IS_STRING}, then the value of
+     * {@code codepointEnd} is undefined.
      */
     public int codepointEnd;
 
     /**
-     * If codepoint == IS_STRING, then string points
-     * to the current string.  If codepoint != IS_STRING, the
-     * value of string is undefined.
+     * If {@code codepoint == IS_STRING}, then {@code string} points
+     * to the current string.  If {@code codepoint != IS_STRING}, the
+     * value of {@code string} is undefined.
      */
     public String string;
 
@@ -92,8 +92,8 @@ public class UnicodeMapIterator {
     }
 
     /**
-     * Create an iterator over nothing.  next() and
-     * nextRange() return false. This is a convenience
+     * Create an iterator over nothing.  {@code next()} and
+     * {@code nextRange()} return false. This is a convenience
      * constructor allowing the target to be set later.
      */
     public UnicodeMapIterator() {
@@ -103,16 +103,16 @@ public class UnicodeMapIterator {
     /**
      * Returns the next element in the set, either a single code point
      * or a string.  If there are no more elements in the set, return
-     * false.  If codepoint == IS_STRING, the value is a
-     * string in the string field.  Otherwise the value is a
-     * single code point in the codepoint field.
+     * false.  If {@code codepoint == IS_STRING}, the value is a
+     * string in the {@code string} field.  Otherwise the value is a
+     * single code point in the {@code codepoint} field.
      *
      * 
      The order of iteration is all code points in sorted order,
-     * followed by all strings sorted order.  codepointEnd is
-     * undefined after calling this method.  string is
-     * undefined unless codepoint == IS_STRING.  Do not mix
-     * calls to next() and nextRange() without
-     * calling reset() between them.  The results of doing so
+     * followed by all strings sorted order.  {@code codepointEnd} is
+     * undefined after calling this method.  {@code string} is
+     * undefined unless {@code codepoint == IS_STRING}.  Do not mix
+     * calls to {@code next()} and {@code nextRange()} without
+     * calling {@code reset()} between them.  The results of doing so
      * are undefined.
      *
      * @return true if there was another element in the set and this
@@ -143,17 +143,17 @@ public class UnicodeMapIterator {
     /**
      * Returns the next element in the set, either a code point range
      * or a string.  If there are no more elements in the set, return
-     * false.  If codepoint == IS_STRING, the value is a
-     * string in the string field.  Otherwise the value is a
-     * range of one or more code points from codepoint to
-     * codepointeEnd inclusive.
+     * false.  If {@code codepoint == IS_STRING}, the value is a
+     * string in the {@code string} field.  Otherwise the value is a
+     * range of one or more code points from {@code codepoint} to
+     * {@code codepointeEnd} inclusive.
      *
      * 
      The order of iteration is all code points ranges in sorted
      * order, followed by all strings sorted order.  Ranges are
-     * disjoint and non-contiguous.  string is undefined
-     * unless codepoint == IS_STRING.  Do not mix calls to
-     * next() and nextRange() without calling
-     * reset() between them.  The results of doing so are
+     * disjoint and non-contiguous.  {@code string} is undefined
+     * unless {@code codepoint == IS_STRING}.  Do not mix calls to
+     * {@code next()} and {@code nextRange()} without calling
+     * {@code reset()} between them.  The results of doing so are
      * undefined.
      *
      * @return true if there was another element in the set and this
@@ -188,7 +188,7 @@ public class UnicodeMapIterator {
     /**
      * Sets this iterator to visit the elements of the given set and
      * resets it to the start of that set.  The iterator is valid only
-     * so long as set is valid.
+     * so long as {@code set} is valid.
      * @param set the set to iterate over.
      */
     public void reset(UnicodeMap set) {
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/math/BigDecimal.java b/icu4j/main/core/src/main/java/com/ibm/icu/math/BigDecimal.java
index 45266c4b6b4..bd699735064 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/math/BigDecimal.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/math/BigDecimal.java
@@ -11,7 +11,7 @@ import com.ibm.icu.lang.UCharacter;
 /* ------------------------------------------------------------------ */
 /* BigDecimal -- Decimal arithmetic for Java                          */
 /* ------------------------------------------------------------------ */
-/* Copyright IBM Corporation, 1996-2016.  All Rights Reserved.       */
+/* Copyright IBM Corporation, 1996-2016.  All Rights Reserved.        */
 /*                                                                    */
 /* The BigDecimal class provides immutable arbitrary-precision        */
 /* floating point (including integer) decimal numbers.                */
@@ -1237,15 +1237,15 @@ public class BigDecimal extends java.lang.Number implements java.io.Serializable
      * and returns a result of type int.
      * 
      
      * The result will be:
-     * 
+     * 
      
      * 
-     * 
+     * 
      * 
      * 
-     * 
+     * 
      * 
      * 
-     * 
+     * 
      * 
      * 
      -1 if the current object is less than the first parameter-1 if the current object is less than the first parameter
      0 if the current object is equal to the first parameter0 if the current object is equal to the first parameter
      1 if the current object is greater than the first parameter.1 if the current object is greater than the first parameter.
      
      * 
      
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/BreakIterator.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/BreakIterator.java
index 7223d22e4c3..1fc0675a4f3 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/BreakIterator.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/BreakIterator.java
@@ -992,9 +992,9 @@ public abstract class BreakIterator implements Cloneable
      * {@icu} Returns the locale that was used to create this object, or null.
      * This may may differ from the locale requested at the time of
      * this object's creation.  For example, if an object is created
-     * for locale en_US_CALIFORNIA, the actual data may be
-     * drawn from en (the actual locale), and
-     * en_US may be the most specific locale that exists (the
+     * for locale {@code en_US_CALIFORNIA}, the actual data may be
+     * drawn from {@code en} (the actual locale), and
+     * {@code en_US} may be the most specific locale that exists (the
      * valid locale).
      *
      * 
      Note: The actual locale is returned correctly, but the valid
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/ComposedCharIter.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/ComposedCharIter.java
index de60cfa0b1d..309dfe30d3d 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/ComposedCharIter.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/ComposedCharIter.java
@@ -15,7 +15,7 @@ import com.ibm.icu.impl.Normalizer2Impl;
  * One problem is that this class is not designed to return supplementary characters.
  * Use the Normalizer2 and UCharacter classes instead.
  * 
      
- * ComposedCharIter is an iterator class that returns all
+ * {@code ComposedCharIter} is an iterator class that returns all
  * of the precomposed characters defined in the Unicode standard, along
  * with their decomposed forms.  This is often useful when building
  * data tables (e.g. collation tables) which need to treat composed
@@ -30,17 +30,17 @@ import com.ibm.icu.impl.Normalizer2Impl;
  * 
      
  * You can avoid this problem by ensuring that the collation table contains
  * rules for both the decomposed and composed versions of each character.
- * To do so, use a ComposedCharIter to iterate through all of the
+ * To do so, use a {@code ComposedCharIter} to iterate through all of the
  * composed characters in Unicode.  If the decomposition for that character
  * consists solely of characters that are listed in your ruleset, you can
  * add a new rule for the composed character that makes it equivalent to
  * its decomposition sequence.
  * 
      
- * Note that ComposedCharIter iterates over a static table
+ * Note that {@code ComposedCharIter} iterates over a static table
  * of the composed characters in Unicode.  If you want to iterate over the
  * composed characters in a particular string, use {@link Normalizer} instead.
  * 
      
- * When constructing a ComposedCharIter there is one
+ * When constructing a {@code ComposedCharIter} there is one
  * optional feature that you can enable or disable:
  * 
        
  *   
      • {@link Normalizer#IGNORE_HANGUL} - Do not iterate over the Hangul
@@ -50,7 +50,7 @@ import com.ibm.icu.impl.Normalizer2Impl;
  *          is a canonical decomposition.
  * 
      
  * 
      
- * ComposedCharIter is currently based on version 2.1.8 of the
+ * {@code ComposedCharIter} is currently based on version 2.1.8 of the
  * Unicode Standard.
  * It will be updated as later versions of Unicode are released.
  * @deprecated ICU 2.2
@@ -68,7 +68,7 @@ public final class ComposedCharIter {
     public static final  char DONE = (char) Normalizer.DONE;
 
     /**
-     * Construct a new ComposedCharIter.  The iterator will return
+     * Construct a new {@code ComposedCharIter}.  The iterator will return
      * all Unicode characters with canonical decompositions, including Korean
      * Hangul characters.
      * @deprecated ICU 2.2
@@ -79,10 +79,10 @@ public final class ComposedCharIter {
     }
 
     /**
-     * Constructs a non-default ComposedCharIter with optional behavior.
+     * Constructs a non-default {@code ComposedCharIter} with optional behavior.
      * 
      
-     * @param compat    false for canonical decompositions only;
-     *                  true for both canonical and compatibility
+     * @param compat    {@code false} for canonical decompositions only;
+     *                  {@code true} for both canonical and compatibility
      *                  decompositions.
      *
      * @param options   Optional decomposition features. None are supported, so this is ignored.
@@ -112,10 +112,10 @@ public final class ComposedCharIter {
     
     /**
      * Returns the next precomposed Unicode character.
-     * Repeated calls to next return all of the precomposed characters defined
+     * Repeated calls to {@code next} return all of the precomposed characters defined
      * by Unicode, in ascending order.  After all precomposed characters have
-     * been returned, {@link #hasNext} will return false and further calls
-     * to next will return {@link #DONE}.
+     * been returned, {@link #hasNext} will return {@code false} and further calls
+     * to {@code next} will return {@link #DONE}.
      * @deprecated ICU 2.2
      */
     @Deprecated
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/DateFormatSymbols.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/DateFormatSymbols.java
index dc35f957a80..f084d74e8f1 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/DateFormatSymbols.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/DateFormatSymbols.java
@@ -2354,9 +2354,9 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      * Returns the locale that was used to create this object, or null.
      * This may may differ from the locale requested at the time of
      * this object's creation.  For example, if an object is created
-     * for locale en_US_CALIFORNIA, the actual data may be
-     * drawn from en (the actual locale), and
-     * en_US may be the most specific locale that exists (the
+     * for locale {@code en_US_CALIFORNIA}, the actual data may be
+     * drawn from {@code en} (the actual locale), and
+     * {@code en_US} may be the most specific locale that exists (the
      * valid locale).
      *
      * 
      Note: This method will be implemented in ICU 3.0; ICU 2.8
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/DecimalFormatSymbols.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/DecimalFormatSymbols.java
index 726c91c1a09..41cb0a74840 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/DecimalFormatSymbols.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/DecimalFormatSymbols.java
@@ -1976,9 +1976,9 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * {@icu} Returns the locale that was used to create this object, or null.
      * This may may differ from the locale requested at the time of
      * this object's creation.  For example, if an object is created
-     * for locale en_US_CALIFORNIA, the actual data may be
-     * drawn from en (the actual locale), and
-     * en_US may be the most specific locale that exists (the
+     * for locale {@code en_US_CALIFORNIA}, the actual data may be
+     * drawn from {@code en} (the actual locale), and
+     * {@code en_US} may be the most specific locale that exists (the
      * valid locale).
      *
      * 
      Note: The actual locale is returned correctly, but the valid
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/MessageFormat.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/MessageFormat.java
index 6a9a6cc37b8..d21506a16c0 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/MessageFormat.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/MessageFormat.java
@@ -101,7 +101,7 @@ import com.ibm.icu.util.ULocale.Category;
  * A numbered pattern argument is matched with a map key that contains that number
  * as an ASCII-decimal-digit string (without leading zero).
  *
- * 
      Patterns and Their Interpretation
      
+ * 
      Patterns and Their Interpretation
      
  *
  * MessageFormat uses patterns of the following form:
  * 
      @@ -242,7 +242,7 @@ import com.ibm.icu.util.ULocale.Category;
  *           
          .setDefaultRuleset(argStyleText);      
  * 
  *
- * 
      Differences from java.text.MessageFormat
      
+ * 
      Differences from java.text.MessageFormat
      
  *
  * 
      The ICU MessageFormat supports both named and numbered arguments,
  * while the JDK MessageFormat only supports numbered arguments.
@@ -345,7 +345,7 @@ import com.ibm.icu.util.ULocale.Category;
  * 
      
  * See {@link PluralFormat} and {@link PluralRules} for details.
  *
- * 
      Synchronization
      
+ * 
      Synchronization
      
  *
  * 
      MessageFormats are not synchronized.
  * It is recommended to create separate format instances for each thread.
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/Normalizer.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/Normalizer.java
index a8ea0fcca09..a72ba729c2c 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/Normalizer.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/Normalizer.java
@@ -344,11 +344,11 @@ public final class Normalizer implements Cloneable {
     /**
      * Null operation for use with the {@link com.ibm.icu.text.Normalizer constructors}
      * and the static {@link #normalize normalize} method.  This value tells
-     * the Normalizer to do nothing but return unprocessed characters
+     * the {@code Normalizer} to do nothing but return unprocessed characters
      * from the underlying String or CharacterIterator.  If you have code which
      * requires raw text at some times and normalized text at others, you can
-     * use NO_OP for the cases where you want raw text, rather
-     * than having a separate code path that bypasses Normalizer
+     * use {@code NO_OP} for the cases where you want raw text, rather
+     * than having a separate code path that bypasses {@code Normalizer}
      * altogether.
      * 
      
      * @see #setMode
@@ -545,11 +545,11 @@ public final class Normalizer implements Cloneable {
     //-------------------------------------------------------------------------
 
     /**
-     * Creates a new Normalizer object for iterating over the
+     * Creates a new {@code Normalizer} object for iterating over the
      * normalized form of a given string.
      * 
      
-     * The options parameter specifies which optional
-     * Normalizer features are to be enabled for this object.
+     * The {@code options} parameter specifies which optional
+     * {@code Normalizer} features are to be enabled for this object.
      * 
      
      * @param str  The string to be normalized.  The normalization
      *              will start at the beginning of the string.
@@ -572,7 +572,7 @@ public final class Normalizer implements Cloneable {
     }
 
     /**
-     * Creates a new Normalizer object for iterating over the
+     * Creates a new {@code Normalizer} object for iterating over the
      * normalized form of the given text.
      * 
      
      * @param iter  The input text to be normalized.  The normalization
@@ -596,7 +596,7 @@ public final class Normalizer implements Cloneable {
     }
 
     /**
-     * Creates a new Normalizer object for iterating over the
+     * Creates a new {@code Normalizer} object for iterating over the
      * normalized form of the given text.
      * 
      
      * @param iter  The input text to be normalized.  The normalization
@@ -620,13 +620,13 @@ public final class Normalizer implements Cloneable {
     }
 
     /**
-     * Clones this Normalizer object.  All properties of this
+     * Clones this {@code Normalizer} object.  All properties of this
      * object are duplicated in the new object, including the cloning of any
      * {@link CharacterIterator} that was passed in to the constructor
      * or to {@link #setText(CharacterIterator) setText}.
      * However, the text storage underlying
-     * the CharacterIterator is not duplicated unless the
-     * iterator's clone method does so.
+     * the {@code CharacterIterator} is not duplicated unless the
+     * iterator's {@code clone} method does so.
      *
      * @deprecated ICU 56 Use {@link Normalizer2} instead.
      */
@@ -822,10 +822,10 @@ public final class Normalizer implements Cloneable {
     }
 
     /**
-     * Normalizes a String using the given normalization operation.
+     * Normalizes a {@code String} using the given normalization operation.
      * 
      
-     * The options parameter specifies which optional
-     * Normalizer features are to be enabled for this operation.
+     * The {@code options} parameter specifies which optional
+     * {@code Normalizer} features are to be enabled for this operation.
      * Currently the only available option is {@link #UNICODE_3_2}.
      * If you want the default behavior corresponding to one of the standard
      * Unicode Normalization Forms, use 0 for this argument.
@@ -1564,8 +1564,8 @@ public final class Normalizer implements Cloneable {
      * while {@link #next} and {@link #previous} iterate through characters
      * in the normalized output.  This means that there is not
      * necessarily a one-to-one correspondence between characters returned
-     * by next and previous and the indices passed to and
-     * returned from setIndex and {@link #getIndex}.
+     * by {@code next} and {@code previous} and the indices passed to and
+     * returned from {@code setIndex} and {@link #getIndex}.
      * 
      
      * @param index the desired index in the input text.
      *
@@ -1586,8 +1586,8 @@ public final class Normalizer implements Cloneable {
      ///CLOVER:ON
     /**
      * Retrieve the index of the start of the input text. This is the begin
-     * index of the CharacterIterator or the start (i.e. 0) of the
-     * String over which this Normalizer is iterating
+     * index of the {@code CharacterIterator} or the start (i.e. 0) of the
+     * {@code String} over which this {@code Normalizer} is iterating
      * @deprecated ICU 2.2. Use startIndex() instead.
      * @return The codepoint as an int
      * @see #startIndex
@@ -1599,8 +1599,8 @@ public final class Normalizer implements Cloneable {
 
     /**
      * Retrieve the index of the end of the input text.  This is the end index
-     * of the CharacterIterator or the length of the String
-     * over which this Normalizer is iterating
+     * of the {@code CharacterIterator} or the length of the {@code String}
+     * over which this {@code Normalizer} is iterating
      * @deprecated ICU 2.2. Use endIndex() instead.
      * @return The codepoint as an int
      * @see #endIndex
@@ -1611,7 +1611,7 @@ public final class Normalizer implements Cloneable {
     }
     /**
      * Return the first character in the normalized text.  This resets
-     * the Normalizer's position to the beginning of the text.
+     * the {@code Normalizer's} position to the beginning of the text.
      * @return The codepoint as an int
      * @deprecated ICU 56
      */
@@ -1623,7 +1623,7 @@ public final class Normalizer implements Cloneable {
 
     /**
      * Return the last character in the normalized text.  This resets
-     * the Normalizer's position to be just before the
+     * the {@code Normalizer's} position to be just before the
      * the input text corresponding to that normalized character.
      * @return The codepoint as an int
      * @deprecated ICU 56
@@ -1645,9 +1645,9 @@ public final class Normalizer implements Cloneable {
      * Note: This method sets the position in the input, while
      * {@link #next} and {@link #previous} iterate through characters in the
      * output.  This means that there is not necessarily a one-to-one
-     * correspondence between characters returned by next and
-     * previous and the indices passed to and returned from
-     * setIndex and {@link #getIndex}.
+     * correspondence between characters returned by {@code next} and
+     * {@code previous} and the indices passed to and returned from
+     * {@code setIndex} and {@link #getIndex}.
      * @return The current iteration position
      * @deprecated ICU 56
      */
@@ -1662,8 +1662,8 @@ public final class Normalizer implements Cloneable {
 
     /**
      * Retrieve the index of the start of the input text. This is the begin
-     * index of the CharacterIterator or the start (i.e. 0) of the
-     * String over which this Normalizer is iterating
+     * index of the {@code CharacterIterator} or the start (i.e. 0) of the
+     * {@code String} over which this {@code Normalizer} is iterating
      * @return The current iteration position
      * @deprecated ICU 56
      */
@@ -1674,8 +1674,8 @@ public final class Normalizer implements Cloneable {
 
     /**
      * Retrieve the index of the end of the input text.  This is the end index
-     * of the CharacterIterator or the length of the String
-     * over which this Normalizer is iterating
+     * of the {@code CharacterIterator} or the length of the {@code String}
+     * over which this {@code Normalizer} is iterating
      * @return The current iteration position
      * @deprecated ICU 56
      */
@@ -1695,9 +1695,9 @@ public final class Normalizer implements Cloneable {
      * return previously buffers characters in the old normalization mode
      * until the iteration is able to re-sync at the next base character.
      * It is safest to call {@link #setText setText()}, {@link #first},
-     * {@link #last}, etc. after calling setMode.
+     * {@link #last}, etc. after calling {@code setMode}.
      * 
      
-     * @param newMode the new mode for this Normalizer.
+     * @param newMode the new mode for this {@code Normalizer}.
      * The supported modes are:
      * 
        
      *  
      • {@link #NFC}    - Unicode canonical decompositiion
@@ -1719,7 +1719,7 @@ public final class Normalizer implements Cloneable {
         norm2 = mode.getNormalizer2(options);
     }
     /**
-     * Return the basic operation performed by this Normalizer
+     * Return the basic operation performed by this {@code Normalizer}
      *
      * @see #setMode
      * @deprecated ICU 56
@@ -1729,7 +1729,7 @@ public final class Normalizer implements Cloneable {
         return mode;
     }
     /**
-     * Set options that affect this Normalizer's operation.
+     * Set options that affect this {@code Normalizer}'s operation.
      * Options do not change the basic composition or decomposition operation
      * that is being performed , but they control whether
      * certain optional portions of the operation are done.
@@ -1740,8 +1740,8 @@ public final class Normalizer implements Cloneable {
      * 
      
      *
      * @param   option  the option whose value is to be set.
-     * @param   value   the new setting for the option.  Use true to
-     *                  turn the option on and false to turn it off.
+     * @param   value   the new setting for the option.  Use {@code true} to
+     *                  turn the option on and {@code false} to turn it off.
      *
      * @see #getOption
      * @deprecated ICU 56
@@ -1806,7 +1806,7 @@ public final class Normalizer implements Cloneable {
     }
 
     /**
-     * Set the input text over which this Normalizer will iterate.
+     * Set the input text over which this {@code Normalizer} will iterate.
      * The iteration position is set to the beginning of the input text.
      * @param newText   The new string to be normalized.
      * @deprecated ICU 56
@@ -1822,7 +1822,7 @@ public final class Normalizer implements Cloneable {
     }
 
     /**
-     * Set the input text over which this Normalizer will iterate.
+     * Set the input text over which this {@code Normalizer} will iterate.
      * The iteration position is set to the beginning of the input text.
      * @param newText   The new string to be normalized.
      * @deprecated ICU 56
@@ -1838,7 +1838,7 @@ public final class Normalizer implements Cloneable {
     }
 
     /**
-     * Set the input text over which this Normalizer will iterate.
+     * Set the input text over which this {@code Normalizer} will iterate.
      * The iteration position is set to the beginning of the input text.
      * @param newText   The new string to be normalized.
      * @deprecated ICU 56
@@ -1854,7 +1854,7 @@ public final class Normalizer implements Cloneable {
     }
 
     /**
-     * Set the input text over which this Normalizer will iterate.
+     * Set the input text over which this {@code Normalizer} will iterate.
      * The iteration position is set to the beginning of the input text.
      * @param newText   The new string to be normalized.
      * @deprecated ICU 56
@@ -1870,7 +1870,7 @@ public final class Normalizer implements Cloneable {
     }
 
     /**
-     * Set the input text over which this Normalizer will iterate.
+     * Set the input text over which this {@code Normalizer} will iterate.
      * The iteration position is set to the beginning of the string.
      * @param newText   The new string to be normalized.
      * @deprecated ICU 56
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/NumberFormat.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/NumberFormat.java
index c5aaf51699a..0179af0e9fb 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/NumberFormat.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/NumberFormat.java
@@ -1334,7 +1334,7 @@ public abstract class NumberFormat extends UFormat {
     }
 
     /**
-     * Sets the Currency object used to display currency
+     * Sets the {@code Currency} object used to display currency
      * amounts.  This takes effect immediately, if this format is a
      * currency format.  If this format is not a currency format, then
      * the currency object is used if and when this object becomes a
@@ -1348,7 +1348,7 @@ public abstract class NumberFormat extends UFormat {
     }
 
     /**
-     * Returns the Currency object used to display currency
+     * Returns the {@code Currency} object used to display currency
      * amounts.  This may be null.
      * @stable ICU 2.6
      */
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/PluralRules.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/PluralRules.java
index 57cd6e33894..c2fc2ee0ac2 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/PluralRules.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/PluralRules.java
@@ -133,31 +133,31 @@ import com.ibm.icu.util.ULocale;
  * 
  * 1.0
  * 1
- * 0
+ * 0
  * 1
  * 
  * 
  * 1.00
  * 1
- * 0
+ * 0
  * 2
  * 
  * 
  * 1.3
  * 1
- * 3
+ * 3
  * 1
  * 
  * 
  * 1.03
  * 1
- * 3
+ * 3
  * 2
  * 
  * 
  * 1.23
  * 1
- * 23
+ * 23
  * 2
  * 
  * 
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/SimpleDateFormat.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/SimpleDateFormat.java
index 1a6acb8d102..322c9289305 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/SimpleDateFormat.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/SimpleDateFormat.java
@@ -102,8 +102,7 @@ import com.ibm.icu.util.UResourceBundle;
  *         1996
  *         Year. Normally the length specifies the padding, but for two letters it also specifies the maximum
  *         length. Example:
      
- *             
      
- *             
+ *             
      
  *                 
  *                     
  *                     
@@ -153,7 +152,7 @@ import com.ibm.icu.util.UResourceBundle;
  *                     
  *                 
  *             
      Yeary12345
      
- *             
      
+ *             
  *         
  *     
  *     
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/SymbolTable.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/SymbolTable.java
index b27d2349916..f1797368f05 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/SymbolTable.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/SymbolTable.java
@@ -48,7 +48,7 @@ public interface SymbolTable {
 
     /**
      * Lookup the characters associated with this string and return it.
-     * Return null if no such name exists.  The resultant
+     * Return {@code null} if no such name exists.  The resultant
      * array may have length zero.
      * @param s the symbolic name to lookup
      * @return a char array containing the name's value, or null if
@@ -59,7 +59,7 @@ public interface SymbolTable {
 
     /**
      * Lookup the UnicodeMatcher associated with the given character, and
-     * return it.  Return null if not found.
+     * return it.  Return {@code null} if not found.
      * @param ch a 32-bit code point from 0 to 0x10FFFF inclusive.
      * @return the UnicodeMatcher object represented by the given
      * character, or null if there is no mapping for ch.
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/UFormat.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/UFormat.java
index a27c93ae040..4dcd08b3a3a 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/UFormat.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/UFormat.java
@@ -14,7 +14,7 @@ import com.ibm.icu.util.ULocale;
 
 /**
  * An abstract class that extends {@link java.text.Format} to provide
- * additional ICU protocol, specifically, the getLocale()
+ * additional ICU protocol, specifically, the {@code getLocale()}
  * API.  All ICU format classes are subclasses of this class.
  *
  * @see com.ibm.icu.util.ULocale
@@ -58,9 +58,9 @@ public abstract class UFormat extends Format {
      * Return the locale that was used to create this object, or null.
      * This may may differ from the locale requested at the time of
      * this object's creation.  For example, if an object is created
-     * for locale en_US_CALIFORNIA, the actual data may be
-     * drawn from en (the actual locale), and
-     * en_US may be the most specific locale that exists (the
+     * for locale {@code en_US_CALIFORNIA}, the actual data may be
+     * drawn from {@code en} (the actual locale), and
+     * {@code en_US} may be the most specific locale that exists (the
      * valid locale).
      *
      * 
      Note: This method will be implemented in ICU 3.0; ICU 2.8
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeCompressor.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeCompressor.java
index 88c8a2244f3..8e32ed8d4ea 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeCompressor.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeCompressor.java
@@ -17,15 +17,15 @@ package com.ibm.icu.text;
 * 
      The SCSU works by using dynamically positioned windows
 * consisting of 128 consecutive characters in Unicode.  During compression, 
 * characters within a window are encoded in the compressed stream as the bytes 
-* 0x7F - 0xFF. The SCSU provides transparency for the characters 
-* (bytes) between U+0000 - U+00FF.  The SCSU approximates the 
+* {@code 0x7F - 0xFF}. The SCSU provides transparency for the characters 
+* (bytes) between {@code U+0000 - U+00FF}.  The SCSU approximates the 
 * storage size of traditional character sets, for example 1 byte per
 * character for ASCII or Latin-1 text, and 2 bytes per character for CJK
 * ideographs.
      
 *
 * 
      USAGE
      
 *
-* 
      The static methods on UnicodeCompressor may be used in a
+* 
      The static methods on {@code UnicodeCompressor} may be used in a
 * straightforward manner to compress simple strings:
      
 *
 * 
      @@ -35,7 +35,7 @@ package com.ibm.icu.text;
 *
 * 
      The static methods have a fairly large memory footprint.
 * For finer-grained control over memory usage, 
-* UnicodeCompressor offers more powerful APIs allowing
+* {@code UnicodeCompressor} offers more powerful APIs allowing
 * iterative compression:
      
 *
 * 
      @@ -901,7 +901,7 @@ public final class UnicodeCompressor implements SCSU
     * Determine if a character is in a dynamic window.
     * @param c The character to test
     * @param whichWindow The dynamic window the test
-    * @return true if c will fit in whichWindow, 
+    * @return true if {@code c} will fit in {@code whichWindow}, 
     * false otherwise.
     */
     private boolean inDynamicWindow(int c, 
@@ -915,7 +915,7 @@ public final class UnicodeCompressor implements SCSU
      * Determine if a character is in a static window.
     * @param c The character to test
     * @param whichWindow The static window the test
-    * @return true if c will fit in whichWindow, 
+    * @return true if {@code c} will fit in {@code whichWindow}, 
     * false otherwise.
     */
     private static boolean inStaticWindow(int c, 
@@ -932,7 +932,7 @@ public final class UnicodeCompressor implements SCSU
     /**
     * Determine if a character is compressible.
     * @param c The character to test.
-    * @return true if the c is compressible, false otherwise.
+    * @return true if the {@code c} is compressible, false otherwise.
     */
     private static boolean isCompressible(int c)
     {
@@ -946,7 +946,7 @@ public final class UnicodeCompressor implements SCSU
     /**
      * Determine if a dynamic window for a certain character is defined
      * @param c The character in question
-     * @return The dynamic window containing c, or 
+     * @return The dynamic window containing {@code c}, or 
      * INVALIDWINDOW if not defined.
      */
     private int findDynamicWindow(int c)
@@ -966,7 +966,7 @@ public final class UnicodeCompressor implements SCSU
     /**
      * Determine if a static window for a certain character is defined
      * @param c The character in question
-     * @return The static window containing c, or 
+     * @return The static window containing {@code c}, or 
      * INVALIDWINDOW if not defined.
      */
     private static int findStaticWindow(int c)
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeDecompressor.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeDecompressor.java
index 4c611ed69cc..c8236a155a3 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeDecompressor.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeDecompressor.java
@@ -17,7 +17,7 @@ package com.ibm.icu.text;
 *
 * 
      USAGE
      
 *
-* 
      The static methods on UnicodeDecompressor may be used in a
+* 
      The static methods on {@code UnicodeDecompressor} may be used in a
 * straightforward manner to decompress simple strings:
      
 *
 * 
      @@ -27,7 +27,7 @@ package com.ibm.icu.text;
 *
 * 
      The static methods have a fairly large memory footprint.
 * For finer-grained control over memory usage, 
-* UnicodeDecompressor offers more powerful APIs allowing
+* {@code UnicodeDecompressor} offers more powerful APIs allowing
 * iterative decompression:
      
 *
 * 
      diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeFilter.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeFilter.java
index 87a3961ffb3..e5aebe950e5 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeFilter.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeFilter.java
@@ -21,10 +21,10 @@ package com.ibm.icu.text;
 public abstract class UnicodeFilter implements UnicodeMatcher {
 
     /**
-     * Returns true for characters that are in the selected
+     * Returns {@code true} for characters that are in the selected
      * subset.  In other words, if a character is to be
-     * filtered, then contains() returns
-     * false.
+     * filtered, then {@code contains()} returns
+     * {@code false}.
      * @stable ICU 2.0
      */
     public abstract boolean contains(int c);
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeMatcher.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeMatcher.java
index 619c29c6224..0f3a654418d 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeMatcher.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeMatcher.java
@@ -118,7 +118,7 @@ public interface UnicodeMatcher {
     /**
      * Returns true if this matcher will match a character c, where c
      * & 0xFF == v, at offset, in the forward direction (with limit >
-     * offset).  This is used by RuleBasedTransliterator for
+     * offset).  This is used by {@code RuleBasedTransliterator} for
      * indexing.
      *
      * 
      Note:  This API uses an int even though the value will be
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSet.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSet.java
index a613f8a4e5c..0d1f957bfb6 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSet.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSet.java
@@ -204,45 +204,45 @@ import com.ibm.icu.util.VersionInfo;
  * 
      
  *   
  *     
- *       
+ *       
  *       
  *     
  *     
- *       
+ *       
  *       
  *     
  *     
- *       
+ *       
  *       
  *     
  *     
- *       
+ *       
  *       
  *     
  *     
- *       
+ *       
  *       
  *     
  *     
- *       
+ *       
  *       
  *     
  *     
- *       
+ *       
  *       
  *     
  *     
- *       
+ *       
  *       
  *     
  *   
      pattern :=  pattern :=  ('[' '^'? item* ']') |
  *       property
      item :=  item :=  char | (char '-' char) | pattern-expr
      
  *       
      pattern-expr :=  pattern-expr :=  pattern | pattern-expr pattern |
  *       pattern-expr op pattern
      
  *       
      op :=  op :=  '&' | '-'
      
  *       
      special :=  special :=  '[' | ']' | '-'
      
  *       
      char :=  char :=  any character that is not special
      
  *       | ('\\'       any character)
      
  *       | ('\u' hex hex hex hex)
      
  *       
      hex :=  hex :=  '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' |
      
  *           'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'a' | 'b' | 'c' | 'd' | 'e' | 'f'
      property :=  property :=  a Unicode property set pattern
      
@@ -908,9 +908,9 @@ public class UnicodeSet extends UnicodeFilter implements Iterable, Compa
     }
 
     /**
-     * Returns true if this set contains no elements.
+     * Returns {@code true} if this set contains no elements.
      *
-     * @return true if this set contains no elements.
+     * @return {@code true} if this set contains no elements.
      * @stable ICU 2.0
      */
     public boolean isEmpty() {
@@ -926,9 +926,9 @@ public class UnicodeSet extends UnicodeFilter implements Iterable, Compa
     }
 
     /**
-     * Implementation of UnicodeMatcher API.  Returns true if
+     * Implementation of UnicodeMatcher API.  Returns {@code true} if
      * this set contains any character whose low byte is the given
-     * value.  This is used by RuleBasedTransliterator for
+     * value.  This is used by {@code RuleBasedTransliterator} for
      * indexing.
      * @stable ICU 2.0
      */
@@ -1980,10 +1980,10 @@ public class UnicodeSet extends UnicodeFilter implements Iterable, Compa
     }
 
     /**
-     * Returns true if this set contains the given
+     * Returns {@code true} if this set contains the given
      * multicharacter string.
      * @param s string to be checked for containment
-     * @return true if this set contains the specified string
+     * @return {@code true} if this set contains the specified string
      * @stable ICU 2.0
      */
     public final boolean contains(CharSequence s) {
@@ -2455,13 +2455,13 @@ public class UnicodeSet extends UnicodeFilter implements Iterable, Compa
 
     /**
      * Compares the specified object with this set for equality.  Returns
-     * true if the specified object is also a set, the two sets
+     * {@code true} if the specified object is also a set, the two sets
      * have the same size, and every member of the specified set is
      * contained in this set (or equivalently, every member of this set is
      * contained in the specified set).
      *
      * @param o Object to be compared for equality with this set.
-     * @return true if the specified Object is equal to this set.
+     * @return {@code true} if the specified Object is equal to this set.
      * @stable ICU 2.0
      */
     @Override
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSetIterator.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSetIterator.java
index 7fc7a1bab6c..7cee8deddf0 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSetIterator.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSetIterator.java
@@ -50,35 +50,35 @@ import java.util.Iterator;
 public final class UnicodeSetIterator {
 
     /**
-     * Value of codepoint if the iterator points to a string.
-     * If codepoint == IS_STRING, then examine
-     * string for the current iteration result.
+     * Value of {@code codepoint} if the iterator points to a string.
+     * If {@code codepoint == IS_STRING}, then examine
+     * {@code string} for the current iteration result.
      * @stable ICU 2.0
      */
     public static final int IS_STRING = -1;
 
     /**
-     * Current code point, or the special value IS_STRING, if
+     * Current code point, or the special value {@code IS_STRING}, if
      * the iterator points to a string.
      * @stable ICU 2.0
      */
     public int codepoint;
 
     /**
-     * When iterating over ranges using nextRange(),
-     * codepointEnd contains the inclusive end of the
-     * iteration range, if codepoint != IS_STRING.  If
-     * iterating over code points using next(), or if
-     * codepoint == IS_STRING, then the value of
-     * codepointEnd is undefined.
+     * When iterating over ranges using {@code nextRange()},
+     * {@code codepointEnd} contains the inclusive end of the
+     * iteration range, if {@code codepoint != IS_STRING}.  If
+     * iterating over code points using {@code next()}, or if
+     * {@code codepoint == IS_STRING}, then the value of
+     * {@code codepointEnd} is undefined.
      * @stable ICU 2.0
      */
     public int codepointEnd;
 
     /**
-     * If codepoint == IS_STRING, then string points
-     * to the current string.  If codepoint != IS_STRING, the
-     * value of string is undefined.
+     * If {@code codepoint == IS_STRING}, then {@code string} points
+     * to the current string.  If {@code codepoint != IS_STRING}, the
+     * value of {@code string} is undefined.
      * @stable ICU 2.0
      */
     public String string;
@@ -93,8 +93,8 @@ public final class UnicodeSetIterator {
     }
 
     /**
-     * Create an iterator over nothing.  next() and
-     * nextRange() return false. This is a convenience
+     * Create an iterator over nothing.  {@code next()} and
+     * {@code nextRange()} return false. This is a convenience
      * constructor allowing the target to be set later.
      * @stable ICU 2.0
      */
@@ -122,16 +122,16 @@ public final class UnicodeSetIterator {
     /**
      * Returns the next element in the set, either a single code point
      * or a string.  If there are no more elements in the set, return
-     * false.  If codepoint == IS_STRING, the value is a
-     * string in the string field.  Otherwise the value is a
-     * single code point in the codepoint field.
+     * false.  If {@code codepoint == IS_STRING}, the value is a
+     * string in the {@code string} field.  Otherwise the value is a
+     * single code point in the {@code codepoint} field.
      *
      * 
      The order of iteration is all code points in sorted order,
-     * followed by all strings sorted order.  codepointEnd is
-     * undefined after calling this method.  string is
-     * undefined unless codepoint == IS_STRING.  Do not mix
-     * calls to next() and nextRange() without
-     * calling reset() between them.  The results of doing so
+     * followed by all strings sorted order.  {@code codepointEnd} is
+     * undefined after calling this method.  {@code string} is
+     * undefined unless {@code codepoint == IS_STRING}.  Do not mix
+     * calls to {@code next()} and {@code nextRange()} without
+     * calling {@code reset()} between them.  The results of doing so
      * are undefined.
      * 
      Warning: For speed, UnicodeSet iteration does not check for concurrent modification.
      * Do not alter the UnicodeSet while iterating.
@@ -166,17 +166,17 @@ public final class UnicodeSetIterator {
     /**
      * Returns the next element in the set, either a code point range
      * or a string.  If there are no more elements in the set, return
-     * false.  If codepoint == IS_STRING, the value is a
-     * string in the string field.  Otherwise the value is a
-     * range of one or more code points from codepoint to
-     * codepointeEnd inclusive.
+     * false.  If {@code codepoint == IS_STRING}, the value is a
+     * string in the {@code string} field.  Otherwise the value is a
+     * range of one or more code points from {@code codepoint} to
+     * {@code codepointeEnd} inclusive.
      *
      * 
      The order of iteration is all code points ranges in sorted
      * order, followed by all strings sorted order.  Ranges are
-     * disjoint and non-contiguous.  string is undefined
-     * unless codepoint == IS_STRING.  Do not mix calls to
-     * next() and nextRange() without calling
-     * reset() between them.  The results of doing so are
+     * disjoint and non-contiguous.  {@code string} is undefined
+     * unless {@code codepoint == IS_STRING}.  Do not mix calls to
+     * {@code next()} and {@code nextRange()} without calling
+     * {@code reset()} between them.  The results of doing so are
      * undefined.
      *
      * @return true if there was another element in the set and this
@@ -214,7 +214,7 @@ public final class UnicodeSetIterator {
     /**
      * Sets this iterator to visit the elements of the given set and
      * resets it to the start of that set.  The iterator is valid only
-     * so long as set is valid.
+     * so long as {@code set} is valid.
      * @param uset the set to iterate over.
      * @stable ICU 2.0
      */
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/BasicTimeZone.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/BasicTimeZone.java
index 9d958a462ea..b88a459c447 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/util/BasicTimeZone.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/BasicTimeZone.java
@@ -19,8 +19,8 @@ import com.ibm.icu.impl.Grego;
  * {@icu} BasicTimeZone extends TimeZone with additional methods to access
  * time zone transitions and rules.  All ICU TimeZone concrete subclasses
  * extend this class. APIs added to java.util.TimeZone by
- * BasicTimeZone are annotated with '[icu]'.
+ * BasicTimeZone are annotated with '[icu]'.
  *
  * @see com.ibm.icu.util.TimeZoneRule
  * @see com.ibm.icu.util.TimeZoneTransition
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java
index 9fd460b014e..5b49c60aaf3 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java
@@ -301,13 +301,13 @@ import com.ibm.icu.util.ULocale.Category;
  *
  * 
      Note: You should always use {@link #roll roll} and {@link #add add} rather
  * than attempting to perform arithmetic operations directly on the fields
- * of a Calendar.  It is quite possible for Calendar subclasses
+ * of a {@code Calendar}.  It is quite possible for {@code Calendar} subclasses
  * to have fields with non-linear behavior, for example missing months
- * or days during non-leap years.  The subclasses' add and roll
+ * or days during non-leap years.  The subclasses' {@code add} and {@code roll}
  * methods will take this into account, while simple arithmetic manipulations
  * may give invalid results.
  *
- * 
      Calendar Architecture in ICU4J
      
+ * 
      Calendar Architecture in ICU4J
      
  *
  * 
      Recently the implementation of Calendar has changed
  * significantly in order to better support subclassing. The original
@@ -322,7 +322,7 @@ import com.ibm.icu.util.ULocale.Category;
  * java.util.Calendar.
  * 
      
  *
- * 
      Changes
      
+ * 
      Changes
      
  *
  * 
      Overview of changes between the classic Calendar
  * architecture and the new architecture.
@@ -402,7 +402,7 @@ import com.ibm.icu.util.ULocale.Category;
  *
  * 
    
  *
- * 
    Subclass API
    
+ * 
    Subclass API
    
  *
  * 
    The original Calendar API was based on the experience
  * of implementing a only a single subclass,
@@ -428,7 +428,7 @@ import com.ibm.icu.util.ULocale.Category;
  * fields and the time related fields. These are commonly handled for all
  * calendars by the base class. 
    
  *
- * 
    Subclass computation of time => fields
+ * 
    Subclass computation of time {@code =>} fields
  *
  * 
    The {@link #ERA}, {@link #YEAR},
  * {@link #EXTENDED_YEAR}, {@link #MONTH},
@@ -455,7 +455,7 @@ import com.ibm.icu.util.ULocale.Category;
  *
  * 

  *
- * 
Subclass computation of fields => time
+ * 
Subclass computation of fields {@code =>} time
  *
  * 
The interpretation of most field values is handled entirely by
  * Calendar. Calendar determines which fields
@@ -495,7 +495,7 @@ import com.ibm.icu.util.ULocale.Category;
  *   
  • Subclasses should implement {@link #handleGetYearLength}
  *     to return the number of days in the given
  *     extended year. This method is used by
- *     computeWeekFields to compute the
+ *     {@code computeWeekFields} to compute the
  *     {@link #WEEK_OF_YEAR} and {@link #YEAR_WOY} fields.
    • 
  *
  *   
  • Subclasses should implement {@link #handleGetLimit}
@@ -545,7 +545,7 @@ import com.ibm.icu.util.ULocale.Category;
  *
  * 
  *
- * 
    Normalized behavior
+ * 
    Normalized behavior
    
  *
  * 
    The behavior of certain fields has been made consistent across all
  * calendar systems and implemented in Calendar.
@@ -587,7 +587,7 @@ import com.ibm.icu.util.ULocale.Category;
  *
  * 
  *
- * 
    Supported range
+ * 
    Supported range
    
  *
  * 
    The allowable range of Calendar has been
  * narrowed. GregorianCalendar used to attempt to support
@@ -602,7 +602,7 @@ import com.ibm.icu.util.ULocale.Category;
  * should use the protected constants in Calendar to
  * specify an extremely early or extremely late date.
    
  *
- * 
    General notes
+ * 
    General notes
    
  *
  * 
      
  *
@@ -2887,19 +2887,19 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable
-     * Note: Calling roll(field, true) N times is not
-     * necessarily equivalent to calling roll(field, N).  For example,
+     * Note: Calling {@code roll(field, true)} N times is not
+     * necessarily equivalent to calling {@code roll(field, N)}.  For example,
      * imagine that you start with the date Gregorian date January 31, 1995.  If you call
-     * roll(Calendar.MONTH, 2), the result will be March 31, 1995.
-     * But if you call roll(Calendar.MONTH, true), the result will be
+     * {@code roll(Calendar.MONTH, 2)}, the result will be March 31, 1995.
+     * But if you call {@code roll(Calendar.MONTH, true)}, the result will be
      * February 28, 1995.  Calling it one more time will give March 28, 1995, which
      * is usually not the desired result.
      * 
      
-     * Note: You should always use roll and add rather
+     * Note: You should always use {@code roll} and {@code add} rather
      * than attempting to perform arithmetic operations directly on the fields
-     * of a Calendar.  It is quite possible for Calendar subclasses
+     * of a {@code Calendar}.  It is quite possible for {@code Calendar} subclasses
      * to have fields with non-linear behavior, for example missing months
-     * or days during non-leap years.  The subclasses' add and roll
+     * or days during non-leap years.  The subclasses' {@code add} and {@code roll}
      * methods will take this into account, while simple arithmetic manipulations
      * may give invalid results.
      * 
      
@@ -2952,11 +2952,11 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableroll.
      * 
      
-     * Note: You should always use roll and add rather
+     * Note: You should always use {@code roll} and {@code add} rather
      * than attempting to perform arithmetic operations directly on the fields
-     * of a Calendar.  It is quite possible for Calendar subclasses
+     * of a {@code Calendar}.  It is quite possible for {@code Calendar} subclasses
      * to have fields with non-linear behavior, for example missing months
-     * or days during non-leap years.  The subclasses' add and roll
+     * or days during non-leap years.  The subclasses' {@code add} and {@code roll}
      * methods will take this into account, while simple arithmetic manipulations
      * may give invalid results.
      * 
      
@@ -3330,11 +3330,11 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableadd.
      * 
      
-     * Note: You should always use roll and add rather
+     * Note: You should always use {@code roll} and {@code add} rather
      * than attempting to perform arithmetic operations directly on the fields
-     * of a Calendar.  It is quite possible for Calendar subclasses
+     * of a {@code Calendar}.  It is quite possible for {@code Calendar} subclasses
      * to have fields with non-linear behavior, for example missing months
-     * or days during non-leap years.  The subclasses' add and roll
+     * or days during non-leap years.  The subclasses' {@code add} and {@code roll}
      * methods will take this into account, while simple arithmetic manipulations
      * may give invalid results.
      * 
      
@@ -6746,9 +6746,9 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableen_US_CALIFORNIA, the actual data may be
-     * drawn from en (the actual locale), and
-     * en_US may be the most specific locale that exists (the
+     * for locale {@code en_US_CALIFORNIA}, the actual data may be
+     * drawn from {@code en} (the actual locale), and
+     * {@code en_US} may be the most specific locale that exists (the
      * valid locale).
      *
      * 
      Note: This method will be implemented in ICU 3.0; ICU 2.8
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/CompactByteArray.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/CompactByteArray.java
index 1c59b833589..228d6c148f5 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/util/CompactByteArray.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/CompactByteArray.java
@@ -19,7 +19,7 @@ import com.ibm.icu.impl.Utility;
  * Han ideographs have the same value.  However, lookup is much faster than a
  * hash table.
  * A compact array of any primitive data type serves two purposes:
- * 
        
+ * 
          
  *     
        • Fast access of the indexed values.
  *     
        • Smaller memory footprint.
  * 
        
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/CompactCharArray.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/CompactCharArray.java
index 5e792be7ad5..3fbb9fe26d6 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/util/CompactCharArray.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/CompactCharArray.java
@@ -21,7 +21,7 @@ import com.ibm.icu.impl.Utility;
  * Han ideographs have the same value.  However, lookup is much faster than a
  * hash table.
  * A compact array of any primitive data type serves two purposes:
- * 
          
+ * 
            
  *     
          • Fast access of the indexed values.
  *     
          • Smaller memory footprint.
  * 
          
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/Currency.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/Currency.java
index d94d1f65915..72da8a08c72 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/util/Currency.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/Currency.java
@@ -40,8 +40,8 @@ import com.ibm.icu.util.ULocale.Category;
 
 /**
  * A class encapsulating a currency, as defined by ISO 4217.  A
- * Currency object can be created given a Locale or
- * given an ISO 4217 code.  Once created, the Currency object
+ * {@code Currency} object can be created given a {@code Locale} or
+ * given an ISO 4217 code.  Once created, the {@code Currency} object
  * can return various data necessary to its proper display:
  *
  * 
          • A display symbol, for a specific locale
@@ -49,11 +49,11 @@ import com.ibm.icu.util.ULocale.Category;
  * 
          • A rounding increment
  * 
          
  *
- * The DecimalFormat class uses these data to display
+ * The {@code DecimalFormat} class uses these data to display
  * currencies.
  *
  * 
          Note: This class deliberately resembles
- * java.util.Currency but it has a completely independent
+ * {@code java.util.Currency} but it has a completely independent
  * implementation, and adds features not present in the JDK.
  * @author Alan Liu
  * @stable ICU 2.2
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/HebrewCalendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/HebrewCalendar.java
index 240a9f6c461..9d090573e5b 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/util/HebrewCalendar.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/HebrewCalendar.java
@@ -439,7 +439,7 @@ public class HebrewCalendar extends Calendar {
      * 
          
      * Note: You should always use {@link #roll roll} and add rather
      * than attempting to perform arithmetic operations directly on the fields
-     * of a HebrewCalendar.  Since the {@link #MONTH MONTH} field behaves
+     * of a {@code HebrewCalendar}.  Since the {@link #MONTH MONTH} field behaves
      * discontinuously in non-leap years, simple arithmetic can give invalid results.
      * 
          
      * @param field     the time field.
@@ -527,7 +527,7 @@ public class HebrewCalendar extends Calendar {
      * 
          
      * Note: You should always use roll and {@link #add add} rather
      * than attempting to perform arithmetic operations directly on the fields
-     * of a HebrewCalendar.  Since the {@link #MONTH MONTH} field behaves
+     * of a {@code HebrewCalendar}.  Since the {@link #MONTH MONTH} field behaves
      * discontinuously in non-leap years, simple arithmetic can give invalid results.
      * 
          
      * @param field     the time field.
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/StringTokenizer.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/StringTokenizer.java
index 8715cdb87b4..b86fcde31a1 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/util/StringTokenizer.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/StringTokenizer.java
@@ -46,12 +46,12 @@ import com.ibm.icu.text.UnicodeSet;
  * are delimiters, or a maximal sequence of consecutive code 
  * points that are not delimiters.
  * 
          
- * A StringTokenizer object internally maintains a current 
+ * A {@code StringTokenizer} object internally maintains a current 
  * position within the string to be tokenized. Some operations advance this 
  * current position past the code point processed.
  * 
          
  * A token is returned by taking a substring of the string that was used to 
- * create the StringTokenizer object.
+ * create the {@code StringTokenizer} object.
  * 
          
  * Example of the use of the default delimiter tokenizer.
  * 
          @@ -290,8 +290,8 @@ public final class StringTokenizer implements Enumeration
     /**
      * Tests if there are more tokens available from this tokenizer's 
      * string. 
-     * If this method returns true, then a subsequent call to 
-     * nextToken with no argument will successfully return a token.
+     * If this method returns {@code true}, then a subsequent call to 
+     * {@code nextToken} with no argument will successfully return a token.
      * @return true if and only if there is at least one token 
      *         in the string after the current position; false 
      *         otherwise.
@@ -383,8 +383,8 @@ public final class StringTokenizer implements Enumeration
     /**
      * Returns the next token in this string tokenizer's string. First, 
      * the set of characters considered to be delimiters by this 
-     * StringTokenizer object is changed to be the characters in 
-     * the string delim. Then the next token in the string
+     * {@code StringTokenizer} object is changed to be the characters in 
+     * the string {@code delim}. Then the next token in the string
      * after the current position is returned. The current position is 
      * advanced beyond the recognized token.  The new delimiter set 
      * remains the default after this call. 
@@ -407,8 +407,8 @@ public final class StringTokenizer implements Enumeration
     /**
      * {@icu} Returns the next token in this string tokenizer's string. First, 
      * the set of characters considered to be delimiters by this 
-     * StringTokenizer object is changed to be the characters in 
-     * the string delim. Then the next token in the string
+     * {@code StringTokenizer} object is changed to be the characters in 
+     * the string {@code delim}. Then the next token in the string
      * after the current position is returned. The current position is 
      * advanced beyond the recognized token.  The new delimiter set 
      * remains the default after this call. 
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/ULocale.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/ULocale.java
index 2a947369cd2..40b96db8342 100644
--- a/icu4j/main/core/src/main/java/com/ibm/icu/util/ULocale.java
+++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/ULocale.java
@@ -94,7 +94,7 @@ import com.ibm.icu.text.LocaleDisplayNames.DialectHandling;
  *
  * 
          This class provides selectors {@link #VALID_LOCALE} and {@link
  * #ACTUAL_LOCALE} intended for use in methods named
- * getLocale().  These methods exist in several ICU classes,
+ * {@code getLocale()}.  These methods exist in several ICU classes,
  * including {@link com.ibm.icu.util.Calendar}, {@link
  * com.ibm.icu.util.Currency}, {@link com.ibm.icu.text.UFormat},
  * {@link com.ibm.icu.text.BreakIterator},
@@ -102,7 +102,7 @@ import com.ibm.icu.text.LocaleDisplayNames.DialectHandling;
  * {@link com.ibm.icu.text.DateFormatSymbols}, and {@link
  * com.ibm.icu.text.DecimalFormatSymbols} and their subclasses, if
  * any. Once an object of one of these classes has been created,
- * getLocale() may be called on it to determine the valid and
+ * {@code getLocale()} may be called on it to determine the valid and
  * actual locale arrived at during the object's construction.
  *
  * 
          Note: The actual locale is returned correctly, but the valid
@@ -2539,7 +2539,7 @@ public final class ULocale implements Serializable, Comparable {
     }
 
     /**
-     * {@icu} Selector for getLocale() indicating the locale of the
+     * {@icu} Selector for {@code getLocale()} indicating the locale of the
      * resource containing the data.  This is always at or above the
      * valid locale.  If the valid locale does not contain the
      * specific data being requested, then the actual locale will be
@@ -2551,7 +2551,7 @@ public final class ULocale implements Serializable, Comparable {
     public static Type ACTUAL_LOCALE = new Type();
 
     /**
-     * {@icu} Selector for getLocale() indicating the most specific
+     * {@icu} Selector for {@code getLocale()} indicating the most specific
      * locale for which any data exists.  This is always at or above
      * the requested locale, and at or below the actual locale.  If
      * the requested locale does not correspond to any resource data,
@@ -2566,7 +2566,7 @@ public final class ULocale implements Serializable, Comparable {
     public static Type VALID_LOCALE = new Type();
 
     /**
-     * Opaque selector enum for getLocale().
+     * Opaque selector enum for {@code getLocale()}.
      * @see com.ibm.icu.util.ULocale
      * @see com.ibm.icu.util.ULocale#ACTUAL_LOCALE
      * @see com.ibm.icu.util.ULocale#VALID_LOCALE
diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/lang/package.html b/icu4j/main/core/src/main/resources/com/ibm/icu/lang/package.html
index 58a4756ac78..ae276af724a 100644
--- a/icu4j/main/core/src/main/resources/com/ibm/icu/lang/package.html
+++ b/icu4j/main/core/src/main/resources/com/ibm/icu/lang/package.html
@@ -15,6 +15,7 @@
 
 
          Enhanced character property and surrogate support.
          
 
-UCharacter supports all characters and properties defined in the latest version of Unicode, including properties of surrogate characters.  It provides new API for querying surrogate characters (represented as int) and also supports the java.lang.Character API.  UScript and UScriptRun provide information about scripts, which is not available through the Java APIs.
          
+
          UCharacter supports all characters and properties defined in the latest version of Unicode, including properties of surrogate characters.  It provides new API for querying surrogate characters (represented as int) and also supports the java.lang.Character API.  UScript and UScriptRun provide information about scripts, which is not available through the Java APIs.
          
+
 
 
diff --git a/icu4j/main/translit/src/main/java/com/ibm/icu/text/CompoundTransliterator.java b/icu4j/main/translit/src/main/java/com/ibm/icu/text/CompoundTransliterator.java
index 9d75c0a138e..d46eb4390f8 100644
--- a/icu4j/main/translit/src/main/java/com/ibm/icu/text/CompoundTransliterator.java
+++ b/icu4j/main/translit/src/main/java/com/ibm/icu/text/CompoundTransliterator.java
@@ -43,9 +43,9 @@ class CompoundTransliterator extends Transliterator {
      * @param transliterators array of Transliterator
      * objects
      * @param filter the filter.  Any character for which
-     * filter.contains() returns false will not be
-     * altered by this transliterator.  If filter is
-     * null then no filtering is applied.
+     * {@code filter.contains()} returns {@code false} will not be
+     * altered by this transliterator.  If {@code filter} is
+     * {@code null} then no filtering is applied.
      */
     /*public CompoundTransliterator(Transliterator[] transliterators,
                                   UnicodeFilter filter) {
diff --git a/icu4j/main/translit/src/main/java/com/ibm/icu/text/Transliterator.java b/icu4j/main/translit/src/main/java/com/ibm/icu/text/Transliterator.java
index 48d47e3ad4f..72c14b85654 100644
--- a/icu4j/main/translit/src/main/java/com/ibm/icu/text/Transliterator.java
+++ b/icu4j/main/translit/src/main/java/com/ibm/icu/text/Transliterator.java
@@ -377,7 +377,7 @@ import com.ibm.icu.util.UResourceBundle;
  * 
          The following example rules illustrate many of the features of
  * the rule language.
  *
- * 
+ * 
          
  *     
  *         
  *         
@@ -395,7 +395,7 @@ import com.ibm.icu.util.UResourceBundle;
  * 
          Applying these rules to the string "adefabcdefz"
  * yields the following results:
  *
- * 
          Rule 1.abc{def}>x|y
          
+ * 
          
  *     
  *         
  *         " );
+                    "" );
                 
                 // Check Duals
                 /*
@@ -233,9 +233,9 @@ public class WriteCharts {
                         group = 0x100;
                         map.put(group + UCharacter.toLowerCase(Normalizer.normalize(ss12, Normalizer.DECOMP_COMPAT, 0))
                                 + "\u0000" + ss12, 
-                            "" );
+                            "" );
                     }
                 }
                 */
@@ -271,7 +271,7 @@ public class WriteCharts {
                 }
                     
                 map.put(group + UCharacter.toLowerCase(Normalizer.normalize(ts, Normalizer.NFKD)) + ts, 
-                    "");
             //}
diff --git a/icu4j/pom.xml b/icu4j/pom.xml
index d8770e05242..7d1e20c12bc 100644
--- a/icu4j/pom.xml
+++ b/icu4j/pom.xml
@@ -371,8 +371,7 @@
                 [ERROR] com\ibm\icu\util\ULocale.java:100: error: reference not found
                 [ERROR]  * {@link com.ibm.icu.text.Collator}
             -->
-            
-            none
+            htmltruetruetrue
@@ -380,7 +379,6 @@
             ${icu4j.api.doc.window.title}
          ${icu4j.api.doc.header}
          ${icu4j.api.doc.copyright.footer}
-            ${icu4j.api.doc.root.dir}/stylesheet8.cssUTF-8UTF-8UTF-8
diff --git a/icu4j/stylesheet8.css b/icu4j/stylesheet8.css
deleted file mode 100644
index c0352f06218..00000000000
--- a/icu4j/stylesheet8.css
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
- * © 2016 and later: Unicode, Inc. and others.
- * License & terms of use: http://www.unicode.org/copyright.html
- */
-/* Javadoc style sheet */
-/*
-Overall document style
-*/
-
-@import url('resources/fonts/dejavu.css');
-
-body {
-    background-color:#ffffff;
-    color:#353833;
-    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
-    font-size:14px;
-    margin:0;
-}
-a:link, a:visited {
-    text-decoration:none;
-    color:#4A6782;
-}
-a:hover, a:focus {
-    text-decoration:none;
-    color:#bb7a2a;
-}
-a:active {
-    text-decoration:none;
-    color:#4A6782;
-}
-a[name] {
-    color:#353833;
-}
-a[name]:hover {
-    text-decoration:none;
-    color:#353833;
-}
-pre {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-}
-h1 {
-    font-size:20px;
-}
-h2 {
-    font-size:18px;
-}
-h3 {
-    font-size:16px;
-    font-style:italic;
-}
-h4 {
-    font-size:13px;
-}
-h5 {
-    font-size:12px;
-}
-h6 {
-    font-size:11px;
-}
-ul {
-    list-style-type:disc;
-}
-code, tt {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    padding-top:4px;
-    margin-top:8px;
-    line-height:1.4em;
-}
-dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    padding-top:4px;
-}
-table tr td dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
-    vertical-align:top;
-    padding-top:4px;
-}
-sup {
-    font-size:8px;
-}
-/*
-Document title and Copyright styles
-*/
-.clear {
-    clear:both;
-    height:0px;
-    overflow:hidden;
-}
-.aboutLanguage {
-    float:right;
-    padding:0px 21px;
-    font-size:11px;
-    z-index:200;
-    margin-top:-9px;
-}
-.legalCopy {
-    margin-left:.5em;
-}
-.bar a, .bar a:link, .bar a:visited, .bar a:active {
-    color:#FFFFFF;
-    text-decoration:none;
-}
-.bar a:hover, .bar a:focus {
-    color:#bb7a2a;
-}
-.tab {
-    background-color:#0066FF;
-    color:#ffffff;
-    padding:8px;
-    width:5em;
-    font-weight:bold;
-}
-/*
-Navigation bar styles
-*/
-.bar {
-    background-color:#4D7A97;
-    color:#FFFFFF;
-    padding:.8em .5em .4em .8em;
-    height:auto;/*height:1.8em;*/
-    font-size:11px;
-    margin:0;
-}
-.topNav {
-    background-color:#4D7A97;
-    color:#FFFFFF;
-    float:left;
-    padding:0;
-    width:100%;
-    clear:right;
-    height:2.8em;
-    padding-top:10px;
-    overflow:hidden;
-    font-size:12px; 
-}
-.bottomNav {
-    margin-top:10px;
-    background-color:#4D7A97;
-    color:#FFFFFF;
-    float:left;
-    padding:0;
-    width:100%;
-    clear:right;
-    height:2.8em;
-    padding-top:10px;
-    overflow:hidden;
-    font-size:12px;
-}
-.subNav {
-    background-color:#dee3e9;
-    float:left;
-    width:100%;
-    overflow:hidden;
-    font-size:12px;
-}
-.subNav div {
-    clear:left;
-    float:left;
-    padding:0 0 5px 6px;
-    text-transform:uppercase;
-}
-ul.navList, ul.subNavList {
-    float:left;
-    margin:0 25px 0 0;
-    padding:0;
-}
-ul.navList li{
-    list-style:none;
-    float:left;
-    padding: 5px 6px;
-    text-transform:uppercase;
-}
-ul.subNavList li{
-    list-style:none;
-    float:left;
-}
-.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
-    color:#FFFFFF;
-    text-decoration:none;
-    text-transform:uppercase;
-}
-.topNav a:hover, .bottomNav a:hover {
-    text-decoration:none;
-    color:#bb7a2a;
-    text-transform:uppercase;
-}
-.navBarCell1Rev {
-    background-color:#F8981D;
-    color:#253441;
-    margin: auto 5px;
-}
-.skipNav {
-    position:absolute;
-    top:auto;
-    left:-9999px;
-    overflow:hidden;
-}
-/*
-Page header and footer styles
-*/
-.header, .footer {
-    clear:both;
-    margin:0 20px;
-    padding:5px 0 0 0;
-}
-.indexHeader {
-    margin:10px;
-    position:relative;
-}
-.indexHeader span{
-    margin-right:15px;
-}
-.indexHeader h1 {
-    font-size:13px;
-}
-.title {
-    color:#2c4557;
-    margin:10px 0;
-}
-.subTitle {
-    margin:5px 0 0 0;
-}
-.header ul {
-    margin:0 0 15px 0;
-    padding:0;
-}
-.footer ul {
-    margin:20px 0 5px 0;
-}
-.header ul li, .footer ul li {
-    list-style:none;
-    font-size:13px;
-}
-/*
-Heading styles
-*/
-div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
-    background-color:#dee3e9;
-    border:1px solid #d0d9e0;
-    margin:0 0 6px -8px;
-    padding:7px 5px;
-}
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
-    background-color:#dee3e9;
-    border:1px solid #d0d9e0;
-    margin:0 0 6px -8px;
-    padding:7px 5px;
-}
-ul.blockList ul.blockList li.blockList h3 {
-    padding:0;
-    margin:15px 0;
-}
-ul.blockList li.blockList h2 {
-    padding:0px 0 20px 0;
-}
-/*
-Page layout container styles
-*/
-.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
-    clear:both;
-    padding:10px 20px;
-    position:relative;
-}
-.indexContainer {
-    margin:10px;
-    position:relative;
-    font-size:12px;
-}
-.indexContainer h2 {
-    font-size:13px;
-    padding:0 0 3px 0;
-}
-.indexContainer ul {
-    margin:0;
-    padding:0;
-}
-.indexContainer ul li {
-    list-style:none;
-    padding-top:2px;
-}
-.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
-    font-size:12px;
-    font-weight:bold;
-    margin:10px 0 0 0;
-    color:#4E4E4E;
-}
-.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
-    margin:5px 0 10px 0px;
-    font-size:14px;
-    font-family:'DejaVu Sans Mono',monospace;
-}
-.serializedFormContainer dl.nameValue dt {
-    margin-left:1px;
-    font-size:1.1em;
-    display:inline;
-    font-weight:bold;
-}
-.serializedFormContainer dl.nameValue dd {
-    margin:0 0 0 1px;
-    font-size:1.1em;
-    display:inline;
-}
-/*
-List styles
-*/
-ul.horizontal li {
-    display:inline;
-    font-size:0.9em;
-}
-ul.inheritance {
-    margin:0;
-    padding:0;
-}
-ul.inheritance li {
-    display:inline;
-    list-style:none;
-}
-ul.inheritance li ul.inheritance {
-    margin-left:15px;
-    padding-left:15px;
-    padding-top:1px;
-}
-ul.blockList, ul.blockListLast {
-    margin:10px 0 10px 0;
-    padding:0;
-}
-ul.blockList li.blockList, ul.blockListLast li.blockList {
-    list-style:none;
-    margin-bottom:15px;
-    line-height:1.4;
-}
-ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
-    padding:0px 20px 5px 10px;
-    border:1px solid #ededed; 
-    background-color:#f8f8f8;
-}
-ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
-    padding:0 0 5px 8px;
-    background-color:#ffffff;
-    border:none;
-}
-ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
-    margin-left:0;
-    padding-left:0;
-    padding-bottom:15px;
-    border:none;
-}
-ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
-    list-style:none;
-    border-bottom:none;
-    padding-bottom:0;
-}
-table tr td dl, table tr td dl dt, table tr td dl dd {
-    margin-top:0;
-    margin-bottom:1px;
-}
-/*
-Table styles
-*/
-.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
-    width:100%;
-    border-left:1px solid #EEE; 
-    border-right:1px solid #EEE; 
-    border-bottom:1px solid #EEE; 
-}
-.overviewSummary, .memberSummary  {
-    padding:0px;
-}
-.overviewSummary caption, .memberSummary caption, .typeSummary caption,
-.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
-    position:relative;
-    text-align:left;
-    background-repeat:no-repeat;
-    color:#253441;
-    font-weight:bold;
-    clear:none;
-    overflow:hidden;
-    padding:0px;
-    padding-top:10px;
-    padding-left:1px;
-    margin:0px;
-    white-space:pre;
-}
-.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
-.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
-.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
-.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
-.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
-.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
-.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
-.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
-    color:#FFFFFF;
-}
-.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
-.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
-    white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    padding-bottom:7px;
-    display:inline-block;
-    float:left;
-    background-color:#F8981D;
-    border: none;
-    height:16px;
-}
-.memberSummary caption span.activeTableTab span {
-    white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    margin-right:3px;
-    display:inline-block;
-    float:left;
-    background-color:#F8981D;
-    height:16px;
-}
-.memberSummary caption span.tableTab span {
-    white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    margin-right:3px;
-    display:inline-block;
-    float:left;
-    background-color:#4D7A97;
-    height:16px;
-}
-.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
-    padding-top:0px;
-    padding-left:0px;
-    padding-right:0px;
-    background-image:none;
-    float:none;
-    display:inline;
-}
-.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
-.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
-    display:none;
-    width:5px;
-    position:relative;
-    float:left;
-    background-color:#F8981D;
-}
-.memberSummary .activeTableTab .tabEnd {
-    display:none;
-    width:5px;
-    margin-right:3px;
-    position:relative; 
-    float:left;
-    background-color:#F8981D;
-}
-.memberSummary .tableTab .tabEnd {
-    display:none;
-    width:5px;
-    margin-right:3px;
-    position:relative;
-    background-color:#4D7A97;
-    float:left;
-
-}
-.overviewSummary td, .memberSummary td, .typeSummary td,
-.useSummary td, .constantsSummary td, .deprecatedSummary td {
-    text-align:left;
-    padding:0px 0px 12px 10px;
-}
-th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
-td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
-    vertical-align:top;
-    padding-right:0px;
-    padding-top:8px;
-    padding-bottom:3px;
-}
-th.colFirst, th.colLast, th.colOne, .constantsSummary th {
-    background:#dee3e9;
-    text-align:left;
-    padding:8px 3px 3px 7px;
-}
-td.colFirst, th.colFirst {
-    white-space:nowrap;
-    font-size:13px;
-}
-td.colLast, th.colLast {
-    font-size:13px;
-}
-td.colOne, th.colOne {
-    font-size:13px;
-}
-.overviewSummary td.colFirst, .overviewSummary th.colFirst,
-.useSummary td.colFirst, .useSummary th.colFirst,
-.overviewSummary td.colOne, .overviewSummary th.colOne,
-.memberSummary td.colFirst, .memberSummary th.colFirst,
-.memberSummary td.colOne, .memberSummary th.colOne,
-.typeSummary td.colFirst{
-    width:25%;
-    vertical-align:top;
-}
-td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
-    font-weight:bold;
-}
-.tableSubHeadingColor {
-    background-color:#EEEEFF;
-}
-.altColor {
-    background-color:#FFFFFF;
-}
-.rowColor {
-    background-color:#EEEEEF;
-}
-/*
-Content styles
-*/
-.description pre {
-    margin-top:0;
-}
-.deprecatedContent {
-    margin:0;
-    padding:10px 0;
-}
-.docSummary {
-    padding:0;
-}
-
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
-    font-style:normal;
-}
-
-div.block {
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
-}
-
-td.colLast div {
-    padding-top:0px;
-}
-
-
-td.colLast a {
-    padding-bottom:3px;
-}
-/*
-Formatting effect styles
-*/
-.sourceLineNo {
-    color:green;
-    padding:0 30px 0 0;
-}
-h1.hidden {
-    visibility:hidden;
-    overflow:hidden;
-    font-size:10px;
-}
-.block {
-    display:block;
-    margin:3px 10px 2px 0px;
-    color:#474747;
-}
-.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
-.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
-.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
-    font-weight:bold;
-}
-.deprecationComment, .emphasizedPhrase, .interfaceName {
-    font-style:italic;
-}
-
-div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
-div.block div.block span.interfaceName {
-    font-style:normal;
-}
-
-div.contentContainer ul.blockList li.blockList h2{
-    padding-bottom:0px;
-}

          |adefabcdefzInitial state, no rules match. Advance
@@ -674,9 +674,9 @@ public abstract class Transliterator implements StringTransform  {
 
     /**
      * This transliterator's filter.  Any character for which
-     * filter.contains() returns false will not be
-     * altered by this transliterator.  If filter is
-     * null then no filtering is applied.
+     * {@code filter.contains()} returns {@code false} will not be
+     * altered by this transliterator.  If {@code filter} is
+     * {@code null} then no filtering is applied.
      */
     private UnicodeSet filter;
 
@@ -742,9 +742,9 @@ public abstract class Transliterator implements StringTransform  {
      * Default constructor.
      * @param ID the string identifier for this transliterator
      * @param filter the filter.  Any character for which
-     * filter.contains() returns false will not be
-     * altered by this transliterator.  If filter is
-     * null then no filtering is applied.
+     * {@code filter.contains()} returns {@code false} will not be
+     * altered by this transliterator.  If {@code filter} is
+     * {@code null} then no filtering is applied.
      * @stable ICU 2.0
      */
     protected Transliterator(String ID, UnicodeFilter filter) {
@@ -1530,7 +1530,7 @@ public abstract class Transliterator implements StringTransform  {
     }
 
     /**
-     * Returns the filter used by this transliterator, or null
+     * Returns the filter used by this transliterator, or {@code null}
      * if this transliterator uses no filter.
      * @stable ICU 2.0
      */
@@ -1540,7 +1540,7 @@ public abstract class Transliterator implements StringTransform  {
 
     /**
      * Changes the filter used by this transliterator.  If the filter
-     * is set to null then no filtering will occur.
+     * is set to {@code null} then no filtering will occur.
      *
      * 
          Callers must take care if a transliterator is in use by
      * multiple threads.  The filter should not be changed by one
diff --git a/icu4j/main/translit/src/test/java/com/ibm/icu/dev/test/translit/WriteCharts.java b/icu4j/main/translit/src/test/java/com/ibm/icu/dev/test/translit/WriteCharts.java
index 5504af39b04..b976e786ac0 100644
--- a/icu4j/main/translit/src/test/java/com/ibm/icu/dev/test/translit/WriteCharts.java
+++ b/icu4j/main/translit/src/test/java/com/ibm/icu/dev/test/translit/WriteCharts.java
@@ -208,9 +208,9 @@ public class WriteCharts {
                     
                 map.put(group + UCharacter.toLowerCase(Normalizer.normalize(ss, Normalizer.NFKD))
                         + "\u0000" + ss, 
-                    "
          		" + ss + "
          " + hex(ss)
-                        + "          		" + ts + "
          " + hex(ts)
-                        + "          		" + rt + "
          " + hex(rt) + "          		" + ss + "
          {@code " + hex(ss)
+                        + "          		" + ts + "
          {@code " + hex(ts)
+                        + "          		" + rt + "
          {@code " + hex(rt) + "          		" + ss12 + "
          " + hex(ss12)
-                                + "          		" + ts12 + "
          " + hex(ts12)
-                                + "          		" + rt12 + "
          " + hex(rt12) + "          		" + ss12 + "
          {@code " + hex(ss12)
+                                + "          		" + ts12 + "
          {@code " + hex(ts12)
+                                + "          		" + rt12 + "
          {@code " + hex(rt12) + "          		-" + ts + "
          " + hex(ts)
+                    "          		-" + ts + "
          {@code " + hex(ts)
                     + "          		"
                     + rt + "
          " + hex(rt) + "