# HG changeset patch
# User rriggs
# Date 1455207543 18000
# Node ID 656b9a28f19e43081bab9933507f1d23054a1145
# Parent  dd5df83fcc0d07b5dc4f1fd67e1d6925f7ee0b32
8142539: Incorrect definition of ZoneOffset.MIN
8140211: Example in the Documentation is wrong for java.time.ZonedDateTime.minusHours
8139529: java.time.temporal.ChronoUnit.FOREVER typo
Reviewed-by: lancea, scolebourne

diff -r dd5df83fcc0d -r 656b9a28f19e jdk/src/java.base/share/classes/java/time/ZoneOffset.java
--- a/jdk/src/java.base/share/classes/java/time/ZoneOffset.java	Wed Feb 10 16:36:25 2016 +0300
+++ b/jdk/src/java.base/share/classes/java/time/ZoneOffset.java	Thu Feb 11 11:19:03 2016 -0500
@@ -150,7 +150,7 @@
      */
     public static final ZoneOffset UTC = ZoneOffset.ofTotalSeconds(0);
     /**
-     * Constant for the maximum supported offset.
+     * Constant for the minimum supported offset.
      */
     public static final ZoneOffset MIN = ZoneOffset.ofTotalSeconds(-MAX_SECONDS);
     /**
diff -r dd5df83fcc0d -r 656b9a28f19e jdk/src/java.base/share/classes/java/time/ZonedDateTime.java
--- a/jdk/src/java.base/share/classes/java/time/ZonedDateTime.java	Wed Feb 10 16:36:25 2016 +0300
+++ b/jdk/src/java.base/share/classes/java/time/ZonedDateTime.java	Thu Feb 11 11:19:03 2016 -0500
@@ -1707,13 +1707,18 @@
      * Note that this is a different approach to that used by days, months and years,
      * thus adding one day is not the same as adding 24 hours.
      * <p>
-     * For example, consider a time-zone where the spring DST cutover means that the
-     * local times 01:00 to 01:59 occur twice changing from offset +02:00 to +01:00.
+     * For example, consider a time-zone, such as 'Europe/Paris', where the
+     * Autumn DST cutover means that the local times 02:00 to 02:59 occur twice
+     * changing from offset +02:00 in summer to +01:00 in winter.
      * <ul>
-     * <li>Adding one hour to 00:30+02:00 will result in 01:30+02:00
-     * <li>Adding one hour to 01:30+02:00 will result in 01:30+01:00
-     * <li>Adding one hour to 01:30+01:00 will result in 02:30+01:00
-     * <li>Adding three hours to 00:30+02:00 will result in 02:30+01:00
+     * <li>Adding one hour to 01:30+02:00 will result in 02:30+02:00
+     *     (both in summer time)
+     * <li>Adding one hour to 02:30+02:00 will result in 02:30+01:00
+     *     (moving from summer to winter time)
+     * <li>Adding one hour to 02:30+01:00 will result in 03:30+01:00
+     *     (both in winter time)
+     * <li>Adding three hours to 01:30+02:00 will result in 03:30+01:00
+     *     (moving from summer to winter time)
      * </ul>
      * <p>
      * This instance is immutable and unaffected by this method call.
@@ -1948,13 +1953,18 @@
      * Note that this is a different approach to that used by days, months and years,
      * thus subtracting one day is not the same as adding 24 hours.
      * <p>
-     * For example, consider a time-zone where the spring DST cutover means that the
-     * local times 01:00 to 01:59 occur twice changing from offset +02:00 to +01:00.
+     * For example, consider a time-zone, such as 'Europe/Paris', where the
+     * Autumn DST cutover means that the local times 02:00 to 02:59 occur twice
+     * changing from offset +02:00 in summer to +01:00 in winter.
      * <ul>
-     * <li>Subtracting one hour from 02:30+01:00 will result in 01:30+02:00
-     * <li>Subtracting one hour from 01:30+01:00 will result in 01:30+02:00
-     * <li>Subtracting one hour from 01:30+02:00 will result in 00:30+01:00
-     * <li>Subtracting three hours from 02:30+01:00 will result in 00:30+02:00
+     * <li>Subtracting one hour from 03:30+01:00 will result in 02:30+01:00
+     *     (both in winter time)
+     * <li>Subtracting one hour from 02:30+01:00 will result in 02:30+02:00
+     *     (moving from winter to summer time)
+     * <li>Subtracting one hour from 02:30+02:00 will result in 01:30+02:00
+     *     (both in summer time)
+     * <li>Subtracting three hours from 03:30+01:00 will result in 01:30+02:00
+     *     (moving from winter to summer time)
      * </ul>
      * <p>
      * This instance is immutable and unaffected by this method call.
diff -r dd5df83fcc0d -r 656b9a28f19e jdk/src/java.base/share/classes/java/time/temporal/ChronoUnit.java
--- a/jdk/src/java.base/share/classes/java/time/temporal/ChronoUnit.java	Wed Feb 10 16:36:25 2016 +0300
+++ b/jdk/src/java.base/share/classes/java/time/temporal/ChronoUnit.java	Thu Feb 11 11:19:03 2016 -0500
@@ -184,8 +184,8 @@
      * Artificial unit that represents the concept of forever.
      * This is primarily used with {@link TemporalField} to represent unbounded fields
      * such as the year or era.
-     * The estimated duration of the era is artificially defined as the largest duration
-     * supported by {@code Duration}.
+     * The estimated duration of this unit is artificially defined as the largest duration
+     * supported by {@link Duration}.
      */
     FOREVER("Forever", Duration.ofSeconds(Long.MAX_VALUE, 999_999_999));