diff --git a/src/java.base/share/classes/java/nio/charset/Charset.java b/src/java.base/share/classes/java/nio/charset/Charset.java
index 51c52732ca5d..da3397bd7597 100644
--- a/src/java.base/share/classes/java/nio/charset/Charset.java
+++ b/src/java.base/share/classes/java/nio/charset/Charset.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -174,14 +174,14 @@
* href="http://www.ietf.org/rfc/rfc2279.txt">RFC 2279; the
* transformation format upon which it is based is specified in
* Amendment 2 of ISO 10646-1 and is also described in the Unicode
+ * href="http://www.unicode.org/standard/standard.html">Unicode
* Standard.
*
*
The {@code UTF-16} charsets are specified by RFC 2781; the
* transformation formats upon which they are based are specified in
* Amendment 1 of ISO 10646-1 and are also described in the Unicode
+ * href="http://www.unicode.org/standard/standard.html">Unicode
* Standard.
*
*
The {@code UTF-16} charsets use sixteen-bit quantities and are
diff --git a/src/java.base/share/classes/java/text/Collator.java b/src/java.base/share/classes/java/text/Collator.java
index eb5f7a983f78..cc0ad518045d 100644
--- a/src/java.base/share/classes/java/text/Collator.java
+++ b/src/java.base/share/classes/java/text/Collator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -189,8 +189,8 @@
*
* CANONICAL_DECOMPOSITION corresponds to Normalization Form D as
* described in
- * Unicode
- * Technical Report #15.
+ * Unicode
+ * Standard Annex #15: Unicode Normalization Forms.
* @see java.text.Collator#getDecomposition
* @see java.text.Collator#setDecomposition
*/
@@ -208,8 +208,8 @@
*
* FULL_DECOMPOSITION corresponds to Normalization Form KD as
* described in
- * Unicode
- * Technical Report #15.
+ * Unicode
+ * Standard Annex #15: Unicode Normalization Forms.
* @see java.text.Collator#getDecomposition
* @see java.text.Collator#setDecomposition
*/
diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
index 7469d5de4d81..3687f40c2913 100644
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -539,7 +539,7 @@
*
*
This class is in conformance with Level 1 of Unicode Technical
- * Standard #18: Unicode Regular Expression, plus RL2.1
+ * Standard #18: Unicode Regular Expressions, plus RL2.1
* Canonical Equivalents and RL2.2 Extended Grapheme Clusters.
*
* Unicode escape sequences such as \u2014
in Java source code
@@ -602,7 +602,7 @@
* {@code gc}) as in {@code general_category=Lu} or {@code gc=Lu}.
*
* The supported categories are those of
- *
+ *
* The Unicode Standard in the version specified by the
* {@link java.lang.Character Character} class. The category names are those
* defined in the Standard, both normative and informative.
@@ -630,8 +630,8 @@
*
* The following Predefined Character classes and POSIX character classes
* are in conformance with the recommendation of Annex C: Compatibility Properties
- * of Unicode Regular Expression
- * , when {@link #UNICODE_CHARACTER_CLASS} flag is specified.
+ * of Unicode Technical Standard #18:
+ * Unicode Regular Expressions, when {@link #UNICODE_CHARACTER_CLASS} flag is specified.
*
*
* predefined and posix character classes in Unicode mode
@@ -906,7 +906,7 @@
* Predefined character classes and POSIX character classes
* are in conformance with
* Unicode Technical
- * Standard #18: Unicode Regular Expression
+ * Standard #18: Unicode Regular Expressions
* Annex C: Compatibility Properties.
*
* The UNICODE_CHARACTER_CLASS mode can also be enabled via the embedded
diff --git a/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java b/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java
index 33dd332d18c7..1714c15143a6 100644
--- a/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java
+++ b/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -62,8 +62,9 @@
*
Bidi algorithm for ICU
*
* This is an implementation of the Unicode Bidirectional Algorithm. The
- * algorithm is defined in the Unicode Standard Annex #9.
+ * algorithm is defined in the
+ * Unicode Standard Annex #9:
+ * Unicode Bidirectional Algorithm.
*
*
* 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
+ * Unicode Standard Annex #9:
+ * Unicode Bidirectional Algorithm.
* 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
- * Unicode Standard Annex #9,
- * version 13,
+ * Unicode Standard Annex #9:
+ * Unicode Bidirectional Algorithm, version 13,
* also described in The Unicode Standard, Version 4.0 .
*
* 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
- * Unicode Standard Annex #9,
- * version 13,
+ * Unicode Standard Annex #9:
+ * Unicode Bidirectional Algorithm, version 13,
* also described in The Unicode Standard, Version 4.0 .
*
* 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
- * Unicode Standard Annex #9,
- * version 13,
+ * Unicode Standard Annex #9:
+ * Unicode Bidirectional Algorithm, version 13,
* also described in The Unicode Standard, Version 4.0 .
*
* This method takes a paragraph of text and computes the
diff --git a/src/java.base/share/classes/jdk/internal/icu/text/BidiLine.java b/src/java.base/share/classes/jdk/internal/icu/text/BidiLine.java
index 2eccd91867b9..6a358abebd77 100644
--- a/src/java.base/share/classes/jdk/internal/icu/text/BidiLine.java
+++ b/src/java.base/share/classes/jdk/internal/icu/text/BidiLine.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -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/unicode/reports/tr9/ , version 13,
+ * Unicode Standard Annex #9:
+ * Unicode Bidirectional Algorithm, version 13,
* also described in The Unicode Standard, Version 4.0.1 .
*
* This means that there is a Bidi object with a levels
diff --git a/src/java.base/share/classes/jdk/internal/icu/text/Normalizer2.java b/src/java.base/share/classes/jdk/internal/icu/text/Normalizer2.java
index b87b7e6f819f..f7fc6d294a35 100644
--- a/src/java.base/share/classes/jdk/internal/icu/text/Normalizer2.java
+++ b/src/java.base/share/classes/jdk/internal/icu/text/Normalizer2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,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/unicode/reports/tr15/
+ * Unicode Standard Annex #15:
+ * Unicode Normalization Forms.
* 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.
diff --git a/src/java.base/share/classes/jdk/internal/icu/text/NormalizerBase.java b/src/java.base/share/classes/jdk/internal/icu/text/NormalizerBase.java
index 14a8fb75fb26..ffe065413a53 100644
--- a/src/java.base/share/classes/jdk/internal/icu/text/NormalizerBase.java
+++ b/src/java.base/share/classes/jdk/internal/icu/text/NormalizerBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
* normalize
transforms Unicode text into an equivalent composed or
* decomposed form, allowing for easier sorting and searching of text.
* normalize
supports the standard normalization forms described in
- *
+ *
* Unicode Standard Annex #15 — Unicode Normalization Forms.
*
* Characters with accents or other adornments can be encoded in
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
index 7addfb7d7e75..7ca00f4ff7fc 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -473,7 +473,7 @@
*
* TODO
*