# HG changeset patch
# User darcy
# Date 1490665138 25200
# Node ID 268fa1f3e670236127e958531d904b3d8a2f379e
# Parent  a81c9c6619fb1502fe10c96d973699b6e0b92009
8177678: Overstatement of universality of Era.getDisplayName() implementation
Reviewed-by: naoto

diff -r a81c9c6619fb -r 268fa1f3e670 jdk/src/java.base/share/classes/java/time/chrono/Era.java
--- a/jdk/src/java.base/share/classes/java/time/chrono/Era.java	Mon Mar 27 15:12:01 2017 -0700
+++ b/jdk/src/java.base/share/classes/java/time/chrono/Era.java	Mon Mar 27 18:38:58 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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
@@ -310,8 +310,8 @@
      * The parameters control the style of the returned text and the locale.
      * <p>
      * If no textual mapping is found then the {@link #getValue() numeric value} is returned.
-     * <p>
-     * This default implementation is suitable for all implementations.
+     *
+     * @apiNote This default implementation is suitable for most implementations.
      *
      * @param style  the style of the text required, not null
      * @param locale  the locale to use, not null
diff -r a81c9c6619fb -r 268fa1f3e670 jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
--- a/jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java	Mon Mar 27 15:12:01 2017 -0700
+++ b/jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java	Mon Mar 27 18:38:58 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, 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
@@ -240,19 +240,10 @@
     }
 
     /**
-     * Gets the textual representation of this era.
-     * <p>
-     * This returns the textual name used to identify the era,
-     * suitable for presentation to the user.
-     * The parameters control the style of the returned text and the locale.
-     * <p>
-     * If no textual mapping is found then the {@link #getValue() numeric value}
-     * is returned.
+     * {@inheritDoc}
      *
-     * @param style  the style of the text required, not null
-     * @param locale  the locale to use, not null
-     * @return the text value of the era, not null
-     * @since 9
+     * @param style {@inheritDoc}
+     * @param locale {@inheritDoc}
      */
     @Override
     public String getDisplayName(TextStyle style, Locale locale) {