diff --git a/src/java.base/share/classes/java/text/DateFormat.java b/src/java.base/share/classes/java/text/DateFormat.java
index af756289086..19835dff7c4 100644
--- a/src/java.base/share/classes/java/text/DateFormat.java
+++ b/src/java.base/share/classes/java/text/DateFormat.java
@@ -101,8 +101,8 @@ import sun.util.locale.provider.LocaleServiceProviderPool;
  * </blockquote>
  *
  * <p>If the specified locale contains "ca" (calendar), "rg" (region override),
- * and/or "tz" (timezone) <a href="../util/Locale.html#def_locale_extension">Unicode
- * extensions</a>, the calendar, the country and/or the time zone for formatting
+ * and/or "tz" (timezone) {@linkplain Locale##def_locale_extension Unicode
+ * extensions}, the calendar, the country and/or the time zone for formatting
  * are overridden. If both "ca" and "rg" are specified, the calendar from the "ca"
  * extension supersedes the implicit one from the "rg" extension.
  *
diff --git a/src/java.base/share/classes/java/text/DateFormatSymbols.java b/src/java.base/share/classes/java/text/DateFormatSymbols.java
index f08f5e78338..9fff6a7c4d4 100644
--- a/src/java.base/share/classes/java/text/DateFormatSymbols.java
+++ b/src/java.base/share/classes/java/text/DateFormatSymbols.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, 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
@@ -84,7 +84,7 @@ import sun.util.locale.provider.TimeZoneNameUtility;
  * </blockquote>
  *
  * <p>If the locale contains "rg" (region override)
- * <a href="../util/Locale.html#def_locale_extension">Unicode extension</a>,
+ * {@linkplain Locale##def_locale_extension Unicode extension},
  * the symbols are overridden for the designated region.
  *
  * <p>
diff --git a/src/java.base/share/classes/java/text/DecimalFormatSymbols.java b/src/java.base/share/classes/java/text/DecimalFormatSymbols.java
index dfb344f26a7..ccb6c02535c 100644
--- a/src/java.base/share/classes/java/text/DecimalFormatSymbols.java
+++ b/src/java.base/share/classes/java/text/DecimalFormatSymbols.java
@@ -60,8 +60,8 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
  * your {@code DecimalFormat} and modify it.
  *
  * <p>The "rg" (region override), "nu" (numbering system), and "cu" (currency)
- * {@code Locale} <a href="../util/Locale.html#def_locale_extension">Unicode
- * extensions</a> are supported which may override values within the symbols.
+ * {@code Locale} {@linkplain Locale##def_locale_extension Unicode
+ * extensions} are supported which may override values within the symbols.
  * For both "nu" and "cu", if they are specified in addition to "rg" by the
  * backing {@code Locale}, the respective values from the "nu" and "cu" extension
  * supersede the implicit ones from the "rg" extension.
diff --git a/src/java.base/share/classes/java/text/NumberFormat.java b/src/java.base/share/classes/java/text/NumberFormat.java
index 759ed7ae5ea..afdba76d1ed 100644
--- a/src/java.base/share/classes/java/text/NumberFormat.java
+++ b/src/java.base/share/classes/java/text/NumberFormat.java
@@ -92,7 +92,7 @@ import sun.util.locale.provider.LocaleServiceProviderPool;
  *
  * <h3>Locale Extensions</h3>
  * Formatting behavior can be changed when using a locale that contains any of the following
- * <a href="../util/Locale.html#def_locale_extension">Unicode extensions</a>,
+ * {@linkplain Locale##def_locale_extension Unicode extensions},
  * <ul>
  * <li> "nu"
  * (<a href="https://unicode.org/reports/tr35/#UnicodeNumberSystemIdentifier">
@@ -110,7 +110,7 @@ import sun.util.locale.provider.LocaleServiceProviderPool;
  * <p>
  * For both "nu" and "cu", if they are specified in addition to "rg", the respective
  * values from the "nu" and "cu" extension supersede the implicit ones from the "rg" extension.
- * Although <a href="../util/Locale.html#def_locale_extension">Unicode extensions</a>
+ * Although {@linkplain Locale##def_locale_extension Unicode extensions}
  * defines various keys and values, actual locale-sensitive service implementations
  * in a Java Runtime Environment might not support any particular Unicode locale
  * attributes or key/type pairs.
@@ -691,7 +691,7 @@ public abstract class NumberFormat extends Format  {
      * <p>If the specified locale contains the "{@code cf}" (
      * <a href="https://www.unicode.org/reports/tr35/tr35.html#UnicodeCurrencyFormatIdentifier">
      * currency format style</a>)
-     * <a href="../util/Locale.html#def_locale_extension">Unicode extension</a>,
+     * {@linkplain Locale##def_locale_extension Unicode extension},
      * the returned currency format uses the style if it is available.
      * Otherwise, the style uses the default "{@code standard}" currency format.
      * For example, if the style designates "{@code account}", negative
diff --git a/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java b/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java
index ffb149bcb8a..2524cc3aa61 100644
--- a/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java
+++ b/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,8 +34,8 @@ import java.util.spi.LocaleServiceProvider;
  * provide instances of the
  * {@link java.text.DecimalFormatSymbols DecimalFormatSymbols} class.
  *
- * <p>The requested {@code Locale} may contain an <a
- * href="../../util/Locale.html#def_locale_extension"> extension</a> for
+ * <p>The requested {@code Locale} may contain an {@linkplain
+ * Locale##def_locale_extension extension} for
  * specifying the desired numbering system. For example, {@code "ar-u-nu-arab"}
  * (in the BCP 47 language tag form) specifies Arabic with the Arabic-Indic
  * digits and symbols, while {@code "ar-u-nu-latn"} specifies Arabic with the
diff --git a/src/java.base/share/classes/java/time/format/DateTimeFormatter.java b/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
index 108f1e1eef8..26192b8e178 100644
--- a/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
+++ b/src/java.base/share/classes/java/time/format/DateTimeFormatter.java
@@ -1508,9 +1508,9 @@ public final class DateTimeFormatter {
      * localization, such as the text or localized pattern.
      * <p>
      * The locale is stored as passed in, without further processing.
-     * If the locale has <a href="../../util/Locale.html#def_locale_extension">
-     * Unicode extensions</a>, they may be used later in text
-     * processing. To set the chronology, time-zone and decimal style from
+     * If the locale has {@linkplain Locale##def_locale_extension Unicode extensions},
+     * they may be used later in text processing.
+     * To set the chronology, time-zone and decimal style from
      * unicode extensions, see {@link #localizedBy localizedBy()}.
      * <p>
      * This instance is immutable and unaffected by this method call.
@@ -1535,7 +1535,7 @@ public final class DateTimeFormatter {
      * localization, such as the text or localized pattern. If the locale contains the
      * "ca" (calendar), "nu" (numbering system), "rg" (region override), and/or
      * "tz" (timezone)
-     * <a href="../../util/Locale.html#def_locale_extension">Unicode extensions</a>,
+     * {@linkplain Locale##def_locale_extension Unicode extensions},
      * the chronology, numbering system and/or the zone are overridden. If both "ca"
      * and "rg" are specified, the chronology from the "ca" extension supersedes the
      * implicit one from the "rg" extension. Same is true for the "nu" extension.
diff --git a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
index 43a79cd85ee..7a2142e5113 100644
--- a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
+++ b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
@@ -205,7 +205,7 @@ public final class DateTimeFormatterBuilder {
      * for the requested dateStyle and/or timeStyle.
      * <p>
      * If the locale contains the "rg" (region override)
-     * <a href="../../util/Locale.html#def_locale_extension">Unicode extensions</a>,
+     * {@linkplain Locale##def_locale_extension Unicode extensions},
      * the formatting pattern is overridden with the one appropriate for the region.
      *
      * @param dateStyle  the FormatStyle for the date, null for time-only pattern
@@ -235,7 +235,7 @@ public final class DateTimeFormatterBuilder {
      * for the requested template.
      * <p>
      * If the locale contains the "rg" (region override)
-     * <a href="../../util/Locale.html#def_locale_extension">Unicode extensions</a>,
+     * {@linkplain Locale##def_locale_extension Unicode extensions},
      * the formatting pattern is overridden with the one appropriate for the region.
      * <p>
      * Refer to {@link #appendLocalized(String)} for the detail of {@code requestedTemplate}
diff --git a/src/java.base/share/classes/java/time/format/DecimalStyle.java b/src/java.base/share/classes/java/time/format/DecimalStyle.java
index a9ad8a4e273..94d6a700ce3 100644
--- a/src/java.base/share/classes/java/time/format/DecimalStyle.java
+++ b/src/java.base/share/classes/java/time/format/DecimalStyle.java
@@ -150,8 +150,8 @@ public final class DecimalStyle {
      * <p>
      * This method provides access to locale sensitive decimal style symbols.
      * If the locale contains "nu" (Numbering System) and/or "rg"
-     * (Region Override) <a href="../../util/Locale.html#def_locale_extension">
-     * Unicode extensions</a>, returned instance will reflect the values specified with
+     * (Region Override) {@linkplain Locale##def_locale_extension Unicode extensions},
+     * returned instance will reflect the values specified with
      * those extensions. If both "nu" and "rg" are specified, the value from
      * the "nu" extension supersedes the implicit one from the "rg" extension.
      *
diff --git a/src/java.base/share/classes/java/time/temporal/WeekFields.java b/src/java.base/share/classes/java/time/temporal/WeekFields.java
index bbad365553d..fc72b806601 100644
--- a/src/java.base/share/classes/java/time/temporal/WeekFields.java
+++ b/src/java.base/share/classes/java/time/temporal/WeekFields.java
@@ -289,8 +289,8 @@ public final class WeekFields implements Serializable {
      * <p>
      * This will look up appropriate values from the provider of localization data.
      * If the locale contains "fw" (First day of week) and/or "rg"
-     * (Region Override) <a href="../../util/Locale.html#def_locale_extension">
-     * Unicode extensions</a>, returned instance will reflect the values specified with
+     * (Region Override) {@linkplain Locale##def_locale_extension Unicode extensions},
+     * returned instance will reflect the values specified with
      * those extensions. If both "fw" and "rg" are specified, the value from
      * the "fw" extension supersedes the implicit one from the "rg" extension.
      *
diff --git a/src/java.base/share/classes/java/util/Calendar.java b/src/java.base/share/classes/java/util/Calendar.java
index 7cf389df42b..e9183ae17da 100644
--- a/src/java.base/share/classes/java/util/Calendar.java
+++ b/src/java.base/share/classes/java/util/Calendar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, 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
@@ -129,8 +129,8 @@ import sun.util.spi.CalendarProvider;
  * parameters: the first day of the week and the minimal days in first week
  * (from 1 to 7).  These numbers are taken from the locale resource data or the
  * locale itself when a {@code Calendar} is constructed. If the designated
- * locale contains "fw" and/or "rg" <a href="./Locale.html#def_locale_extension">
- * Unicode extensions</a>, the first day of the week will be obtained according to
+ * locale contains "fw" and/or "rg" {@linkplain Locale##def_locale_extension
+ * Unicode extensions}, the first day of the week will be obtained according to
  * those extensions. If both "fw" and "rg" are specified, the value from the "fw"
  * extension supersedes the implicit one from the "rg" extension.
  * They may also be specified explicitly through the methods for setting their
@@ -1454,7 +1454,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
          * parameters haven't been given explicitly.
          * <p>
          * If the locale contains the time zone with "tz"
-         * <a href="Locale.html#def_locale_extension">Unicode extension</a>,
+         * {@linkplain Locale##def_locale_extension Unicode extension},
          * and time zone hasn't been given explicitly, time zone in the locale
          * is used.
          *
@@ -1615,7 +1615,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * {@link Locale.Category#FORMAT FORMAT} locale.
      * <p>
      * If the locale contains the time zone with "tz"
-     * <a href="Locale.html#def_locale_extension">Unicode extension</a>,
+     * {@linkplain Locale##def_locale_extension Unicode extension},
      * that time zone is used instead.
      *
      * @return a Calendar.
@@ -1647,7 +1647,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * in the default time zone with the given locale.
      * <p>
      * If the locale contains the time zone with "tz"
-     * <a href="Locale.html#def_locale_extension">Unicode extension</a>,
+     * {@linkplain Locale##def_locale_extension Unicode extension},
      * that time zone is used instead.
      *
      * @param aLocale the locale for the week data
@@ -2632,8 +2632,8 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
     /**
      * Returns an unmodifiable {@code Set} containing all calendar types
      * supported by {@code Calendar} in the runtime environment. The available
-     * calendar types can be used for the <a
-     * href="Locale.html#def_locale_extension">Unicode locale extensions</a>.
+     * calendar types can be used for the {@linkplain Locale##def_locale_extension
+     * Unicode locale extensions}.
      * The {@code Set} returned contains at least {@code "gregory"}. The
      * calendar types don't include aliases, such as {@code "gregorian"} for
      * {@code "gregory"}.
@@ -2667,7 +2667,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * @return the LDML-defined calendar type or the class name of this
      *         {@code Calendar} instance
      * @since 1.8
-     * @see <a href="Locale.html#def_extensions">Locale extensions</a>
+     * @see Locale##def_locale_extension Locale extensions
      * @see Locale.Builder#setLocale(Locale)
      * @see Locale.Builder#setUnicodeLocaleKeyword(String, String)
      */
diff --git a/src/java.base/share/classes/java/util/ResourceBundle.java b/src/java.base/share/classes/java/util/ResourceBundle.java
index b3807ac770a..b375a8ba941 100644
--- a/src/java.base/share/classes/java/util/ResourceBundle.java
+++ b/src/java.base/share/classes/java/util/ResourceBundle.java
@@ -3052,8 +3052,8 @@ public abstract class ResourceBundle {
          * {@code IllegalArgumentException} is thrown.</li>
          *
          * <li>If the {@code locale}'s language is one of the
-         * <a href="./Locale.html#legacy_language_codes">Legacy language
-         * codes</a>, either old or new, then repeat the loading process
+         * {@linkplain Locale##legacy_language_codes Legacy language
+         * codes}, either old or new, then repeat the loading process
          * if needed, with the bundle name with the other language.
          * For example, "iw" for "he" and vice versa.
          *
diff --git a/src/java.base/share/classes/java/util/spi/LocaleNameProvider.java b/src/java.base/share/classes/java/util/spi/LocaleNameProvider.java
index 76712257117..2109a4cead1 100644
--- a/src/java.base/share/classes/java/util/spi/LocaleNameProvider.java
+++ b/src/java.base/share/classes/java/util/spi/LocaleNameProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, 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
@@ -145,7 +145,7 @@ public abstract class LocaleNameProvider extends LocaleServiceProvider {
 
     /**
      * Returns a localized name for the given
-     * <a href="../Locale.html#def_locale_extension">Unicode extension</a> key,
+     * {@linkplain Locale##def_locale_extension Unicode extension} key,
      * and the given locale that is appropriate for display to the user.
      * If the name returned cannot be localized according to {@code locale},
      * this method returns null.
@@ -169,7 +169,7 @@ public abstract class LocaleNameProvider extends LocaleServiceProvider {
 
     /**
      * Returns a localized name for the given
-     * <a href="../Locale.html#def_locale_extension">Unicode extension</a> type,
+     * {@linkplain Locale##def_locale_extension Unicode extension} type,
      * and the given locale that is appropriate for display to the user.
      * If the name returned cannot be localized according to {@code locale},
      * this method returns null.