diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 2f2151efc28a1..73740d2ca3849 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -5356,8 +5356,9 @@ public abstract class Context {
      * {@link android.net.NetworkScoreManager} for managing network scoring.
      * @see #getSystemService(String)
      * @see android.net.NetworkScoreManager
-     * @deprecated see https://developer.android.com/guide/topics/connectivity/wifi-suggest for
-     * alternative API to propose WiFi networks.
+     * @deprecated see
+     * <a href="{@docRoot}guide/topics/connectivity/wifi-suggest">Wi-Fi Suggestion API</a>
+     * for alternative API to propose WiFi networks.
      * @hide
      */
     @SystemApi
diff --git a/core/java/android/net/NetworkScoreManager.java b/core/java/android/net/NetworkScoreManager.java
index 7b8b5c0db335f..804662987655a 100644
--- a/core/java/android/net/NetworkScoreManager.java
+++ b/core/java/android/net/NetworkScoreManager.java
@@ -52,7 +52,7 @@ import java.util.concurrent.Executor;
  * </ul>
  *
  * @deprecated No longer functional on {@link android.os.Build.VERSION_CODES#TIRAMISU} and above.
- * See https://developer.android.com/guide/topics/connectivity/wifi-suggest for
+ * See <a href="{@docRoot}guide/topics/connectivity/wifi-suggest">Wi-Fi Suggestion API</a> for
  * alternative APIs to suggest/configure Wi-Fi networks.
  * @hide
  */
diff --git a/core/java/android/net/WifiKey.java b/core/java/android/net/WifiKey.java
index 2e4ea89d4257e..a67827e6ace47 100644
--- a/core/java/android/net/WifiKey.java
+++ b/core/java/android/net/WifiKey.java
@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
  * Information identifying a Wi-Fi network.
  * @see NetworkKey
  *
- * @deprecated as part of the {@link NetworkScore} deprecation.
+ * @deprecated as part of the {@link NetworkScoreManager} deprecation.
  * @hide
  */
 @Deprecated
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index fab2f6d972eaf..2093b3f39a337 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -12079,7 +12079,7 @@ public final class Settings {
          * Value to specify whether network quality scores and badging should be shown in the UI.
          *
          * Type: int (0 for false, 1 for true)
-         * @deprecated {@code NetworkScoreManager} is deprecated.
+         * @deprecated {@link NetworkScoreManager} is deprecated.
          * @hide
          */
         @Deprecated
@@ -12091,7 +12091,7 @@ public final class Settings {
          * when generating SSID only bases score curves.
          *
          * Type: long
-         * @deprecated {@code NetworkScoreManager} is deprecated.
+         * @deprecated {@link NetworkScoreManager} is deprecated.
          * @hide
          */
         @Deprecated
@@ -12127,7 +12127,7 @@ public final class Settings {
          * {@link NetworkScoreManager#setActiveScorer(String)} to write it.
          *
          * Type: string - package name
-         * @deprecated {@code NetworkScoreManager} is deprecated.
+         * @deprecated {@link NetworkScoreManager} is deprecated.
          * @hide
          */
         @Deprecated
@@ -12140,7 +12140,7 @@ public final class Settings {
          * networks automatically.
          *
          * Type: string package name or null if the feature is either not provided or disabled.
-         * @deprecated {@code NetworkScoreManager} is deprecated.
+         * @deprecated {@link NetworkScoreManager} is deprecated.
          * @hide
          */
         @Deprecated
@@ -12153,7 +12153,7 @@ public final class Settings {
          * {@link com.android.server.wifi.RecommendedNetworkEvaluator}.
          *
          * Type: long
-         * @deprecated {@code NetworkScoreManager} is deprecated.
+         * @deprecated {@link NetworkScoreManager} is deprecated.
          * @hide
          */
         @Deprecated