Merge
authorrriggs
Mon, 23 Mar 2015 10:58:27 -0400
changeset 29602 47f15b73f5e3
parent 29601 d6e9fbd8497a (current diff)
parent 29599 e2c48b046f91 (diff)
child 29603 8bdfa87650e4
Merge
--- a/jdk/src/java.base/share/classes/java/util/Optional.java	Mon Mar 23 09:53:08 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/Optional.java	Mon Mar 23 10:58:27 2015 -0400
@@ -346,7 +346,7 @@
      * </ul>
      *
      * @param obj an object to be tested for equality
-     * @return {code true} if the other object is "equal to" this object
+     * @return {@code true} if the other object is "equal to" this object
      * otherwise {@code false}
      */
     @Override
--- a/jdk/src/java.base/share/classes/java/util/OptionalDouble.java	Mon Mar 23 09:53:08 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/OptionalDouble.java	Mon Mar 23 10:58:27 2015 -0400
@@ -244,7 +244,7 @@
      * </ul>
      *
      * @param obj an object to be tested for equality
-     * @return {code true} if the other object is "equal to" this object
+     * @return {@code true} if the other object is "equal to" this object
      * otherwise {@code false}
      */
     @Override
--- a/jdk/src/java.base/share/classes/java/util/OptionalInt.java	Mon Mar 23 09:53:08 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/OptionalInt.java	Mon Mar 23 10:58:27 2015 -0400
@@ -244,7 +244,7 @@
      * </ul>
      *
      * @param obj an object to be tested for equality
-     * @return {code true} if the other object is "equal to" this object
+     * @return {@code true} if the other object is "equal to" this object
      * otherwise {@code false}
      */
     @Override
--- a/jdk/src/java.base/share/classes/java/util/OptionalLong.java	Mon Mar 23 09:53:08 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/OptionalLong.java	Mon Mar 23 10:58:27 2015 -0400
@@ -244,7 +244,7 @@
      * </ul>
      *
      * @param obj an object to be tested for equality
-     * @return {code true} if the other object is "equal to" this object
+     * @return {@code true} if the other object is "equal to" this object
      * otherwise {@code false}
      */
     @Override