diff --git a/src/java.base/share/classes/java/text/ChoiceFormat.java b/src/java.base/share/classes/java/text/ChoiceFormat.java
index 94b8c188c93..02c3d6b1d5c 100644
--- a/src/java.base/share/classes/java/text/ChoiceFormat.java
+++ b/src/java.base/share/classes/java/text/ChoiceFormat.java
@@ -134,16 +134,6 @@ import java.util.Objects;
  * Use two single quotes in a row to produce a literal single quote. For example,
  * {@code new ChoiceFormat("1# ''one'' ").format(1)} returns {@code " 'one' "}.
  *
- * @apiNote A subclass could perform more consistent pattern validation by
- * throwing an {@code IllegalArgumentException} for all incorrect cases.
- * @implNote Given an incorrect pattern, this implementation may either
- * throw an exception or succeed and discard the incorrect portion. A {@code
- * NumberFormatException} is thrown if a {@code limit} can not be
- * parsed as a numeric value and an {@code IllegalArgumentException} is thrown
- * if a {@code SubPattern} is missing, or the intervals are not ascending.
- * Discarding the incorrect portion may result in a ChoiceFormat with
- * empty {@code limits} and {@code formats}.
- *
  * <h2>Usage Information</h2>
  *
  * <p>
@@ -224,6 +214,21 @@ import java.util.Objects;
  * If multiple threads access a format concurrently, it must be synchronized
  * externally.
  *
+ * @apiNote A subclass could perform more consistent pattern validation by
+ * throwing an {@code IllegalArgumentException} for all incorrect cases.
+ * See the {@code Implementation Note} for this implementation's behavior regarding
+ * incorrect patterns.
+ * <p>This class inherits instance methods from {@code NumberFormat} it does
+ * not utilize; a subclass could override and throw {@code
+ * UnsupportedOperationException} for such methods.
+ * @implNote Given an incorrect pattern, this implementation may either
+ * throw an exception or succeed and discard the incorrect portion. A {@code
+ * NumberFormatException} is thrown if a {@code limit} can not be
+ * parsed as a numeric value and an {@code IllegalArgumentException} is thrown
+ * if a {@code SubPattern} is missing, or the intervals are not ascending.
+ * Discarding the incorrect portion may result in a ChoiceFormat with
+ * empty {@code limits} and {@code formats}.
+ *
  *
  * @see          DecimalFormat
  * @see          MessageFormat