Addressed review comments.

src/java.base/share/classes/java/text/Collator.java

@@ -189,8 +189,8 @@ public abstract class Collator
      * <p>
      * CANONICAL_DECOMPOSITION corresponds to Normalization Form D as
      * described in
-     * <a href="http://www.unicode.org/reports/tr15/tr15-23.html">Unicode
-     * Technical Report #15</a>.
+     * <a href="http://www.unicode.org/reports/tr15/">Unicode
+     * Standard Annex #15: Unicode Normalization Forms</a>.
      * @see java.text.Collator#getDecomposition
      * @see java.text.Collator#setDecomposition
      */
@@ -208,8 +208,8 @@ public abstract class Collator
      * <p>
      * FULL_DECOMPOSITION corresponds to Normalization Form KD as
      * described in
-     * <a href="http://www.unicode.org/reports/tr15/tr15-23.html">Unicode
-     * Technical Report #15</a>.
+     * <a href="http://www.unicode.org/reports/tr15/">Unicode
+     * Standard Annex #15: Unicode Normalization Forms</a>.
      * @see java.text.Collator#getDecomposition
      * @see java.text.Collator#setDecomposition
      */

src/java.base/share/classes/java/util/regex/Pattern.java

@@ -539,7 +539,7 @@
  *
  * <p> This class is in conformance with Level 1 of <a
  * href="http://www.unicode.org/reports/tr18/"><i>Unicode Technical
- * Standard #18: Unicode Regular Expression</i></a>, plus RL2.1
+ * Standard #18: Unicode Regular Expressions</i></a>, plus RL2.1
  * Canonical Equivalents and RL2.2 Extended Grapheme Clusters.
  * <p>
  * <b>Unicode escape sequences</b> such as <code>&#92;u2014</code> in Java source code
@@ -630,8 +630,8 @@
  * <p>
  * The following <b>Predefined Character classes</b> and <b>POSIX character classes</b>
  * are in conformance with the recommendation of <i>Annex C: Compatibility Properties</i>
- * of <a href="http://www.unicode.org/reports/tr18/"><i>Unicode Regular Expression
- * </i></a>, when {@link #UNICODE_CHARACTER_CLASS} flag is specified.
+ * of <a href="http://www.unicode.org/reports/tr18/"><i>Unicode Technical Standard #18:
+ * Unicode Regular Expressions</i></a>, when {@link #UNICODE_CHARACTER_CLASS} flag is specified.
  *
  * <table class="striped">
  * <caption style="display:none">predefined and posix character classes in Unicode mode</caption>

src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java

@@ -62,8 +62,9 @@
  * <h2>Bidi algorithm for ICU</h2>
  *
  * This is an implementation of the Unicode Bidirectional Algorithm. The
- * algorithm is defined in the <a
- * href="http://www.unicode.org/reports/tr9/">Unicode Standard Annex #9</a>.
+ * algorithm is defined in the
+ * <a href="http://www.unicode.org/reports/tr9/">Unicode Standard Annex #9:
+ * Unicode Bidirectional Algorithm</a>.
  * <p>
  *
  * Note: Libraries that perform a bidirectional algorithm and reorder strings
@@ -983,8 +984,9 @@ static class Isolate {
 
     /**
      * Enumerated property Bidi_Paired_Bracket_Type (new in Unicode 6.3).
-     * Used in UAX #9: Unicode Bidirectional Algorithm
-     * (http://www.unicode.org/reports/tr9/)
+     * Used in
+     * <a href="http://www.unicode.org/reports/tr9/">Unicode Standard Annex #9:
+     * Unicode Bidirectional Algorithm</a>.
      * Returns UCharacter.BidiPairedBracketType values.
      * @stable ICU 52
      */
@@ -3363,8 +3365,8 @@ void setParaRunsOnly(char[] parmText, byte parmParaLevel) {
 
     /**
      * Perform the Unicode Bidi algorithm. It is defined in the
-     * <a href="http://www.unicode.org/reports/tr9/">Unicode Standard Annex #9</a>,
-     * version 13,
+     * <a href="http://www.unicode.org/reports/tr9/">Unicode Standard Annex #9:
+     * Unicode Bidirectional Algorithm</a>, version 13,
      * also described in The Unicode Standard, Version 4.0 .<p>
      *
      * This method takes a piece of plain text containing one or more paragraphs,
@@ -3448,8 +3450,8 @@ void setPara(String text, byte paraLevel, byte[] embeddingLevels)
 
     /**
      * Perform the Unicode Bidi algorithm. It is defined in the
-     * <a href="http://www.unicode.org/reports/tr9/">Unicode Standard Annex #9</a>,
-     * version 13,
+     * <a href="http://www.unicode.org/reports/tr9/">Unicode Standard Annex #9:
+     * Unicode Bidirectional Algorithm</a>, version 13,
      * also described in The Unicode Standard, Version 4.0 .<p>
      *
      * This method takes a piece of plain text containing one or more paragraphs,
@@ -3784,8 +3786,8 @@ void setPara(char[] chars, byte paraLevel, byte[] embeddingLevels)
 
     /**
      * Perform the Unicode Bidi algorithm on a given paragraph, as defined in the
-     * <a href="http://www.unicode.org/reports/tr9/">Unicode Standard Annex #9</a>,
-     * version 13,
+     * <a href="http://www.unicode.org/reports/tr9/">Unicode Standard Annex #9:
+     * Unicode Bidirectional Algorithm</a>, version 13,
      * also described in The Unicode Standard, Version 4.0 .<p>
      *
      * This method takes a paragraph of text and computes the

src/java.base/share/classes/jdk/internal/icu/text/BidiLine.java

@@ -47,7 +47,8 @@ final class BidiLine {
      * text in a single paragraph or in a line of a single paragraph
      * which has already been processed according to
      * the Unicode 3.0 Bidi algorithm as defined in
-     * http://www.unicode.org/reports/tr9/ , version 13,
+     * <a href="http://www.unicode.org/reports/tr9/">Unicode Standard Annex #9:
+     * Unicode Bidirectional Algorithm</a>, version 13,
      * also described in The Unicode Standard, Version 4.0.1 .
      *
      * This means that there is a Bidi object with a levels

src/java.base/share/classes/jdk/internal/icu/text/Normalizer2.java

@@ -43,7 +43,8 @@
  * The primary functions are to produce a normalized string and to detect whether
  * a string is already normalized.
  * The most commonly used normalization forms are those defined in
- * http://www.unicode.org/reports/tr15/
+ * <a href="http://www.unicode.org/reports/tr15/">Unicode Standard Annex #15:
+ * Unicode Normalization Forms</a>.
  * However, this API supports additional normalization forms for specialized purposes.
  * For example, NFKC_Casefold is provided via getInstance("nfkc_cf", COMPOSE)
  * and can be used in implementations of UTS #46.

src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java

@@ -473,7 +473,7 @@
  * <hr width="50%">
  * <h3>TODO</h3>
  * <ul>
- *   <li><a href="http://www.unicode.org/reports/tr18/">Unicode Regular Expression Guidelines</a>
+ *   <li><a href="http://www.unicode.org/reports/tr18/">Unicode Technical Standard #18: Unicode Regular Expressions</a>
  *     <ul>
  *       <li>2.4 Canonical Equivalents
  *       <li>Level 3