diff --git a/src/java.base/share/classes/java/time/Duration.java b/src/java.base/share/classes/java/time/Duration.java
index c446bf338ac..6fda63cc25d 100644
--- a/src/java.base/share/classes/java/time/Duration.java
+++ b/src/java.base/share/classes/java/time/Duration.java
@@ -1519,7 +1519,7 @@ public final class Duration
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(1); // identifies a Duration
diff --git a/src/java.base/share/classes/java/time/Instant.java b/src/java.base/share/classes/java/time/Instant.java
index 0aafa49fd40..8f38c76c20f 100644
--- a/src/java.base/share/classes/java/time/Instant.java
+++ b/src/java.base/share/classes/java/time/Instant.java
@@ -1332,7 +1332,7 @@ public final class Instant
// -----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(2); // identifies an Instant
diff --git a/src/java.base/share/classes/java/time/LocalDate.java b/src/java.base/share/classes/java/time/LocalDate.java
index 0a89ec070c4..834a9e3e7df 100644
--- a/src/java.base/share/classes/java/time/LocalDate.java
+++ b/src/java.base/share/classes/java/time/LocalDate.java
@@ -2189,7 +2189,7 @@ public final class LocalDate
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(3); // identifies a LocalDate
diff --git a/src/java.base/share/classes/java/time/LocalDateTime.java b/src/java.base/share/classes/java/time/LocalDateTime.java
index 9a9ca87ddc3..8d3773a36eb 100644
--- a/src/java.base/share/classes/java/time/LocalDateTime.java
+++ b/src/java.base/share/classes/java/time/LocalDateTime.java
@@ -1975,12 +1975,12 @@ public final class LocalDateTime
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(5); // identifies a LocalDateTime
- * // the date excluding the one byte header
- * // the time excluding the one byte header
+ * // the date excluding the one byte header
+ * // the time excluding the one byte header
*
*
* @return the instance of {@code Ser}, not null
diff --git a/src/java.base/share/classes/java/time/LocalTime.java b/src/java.base/share/classes/java/time/LocalTime.java
index 80241339c35..6f427f04d54 100644
--- a/src/java.base/share/classes/java/time/LocalTime.java
+++ b/src/java.base/share/classes/java/time/LocalTime.java
@@ -1645,7 +1645,7 @@ public final class LocalTime
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
* A twos-complement value indicates the remaining values are not in the stream
* and should be set to zero.
diff --git a/src/java.base/share/classes/java/time/MonthDay.java b/src/java.base/share/classes/java/time/MonthDay.java
index c34a4f9c978..c8b5ca86921 100644
--- a/src/java.base/share/classes/java/time/MonthDay.java
+++ b/src/java.base/share/classes/java/time/MonthDay.java
@@ -754,7 +754,7 @@ public final class MonthDay
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(13); // identifies a MonthDay
diff --git a/src/java.base/share/classes/java/time/OffsetDateTime.java b/src/java.base/share/classes/java/time/OffsetDateTime.java
index 39b80bc1fc6..19ae55285f0 100644
--- a/src/java.base/share/classes/java/time/OffsetDateTime.java
+++ b/src/java.base/share/classes/java/time/OffsetDateTime.java
@@ -1915,12 +1915,12 @@ public final class OffsetDateTime
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(10); // identifies an OffsetDateTime
- * // the datetime excluding the one byte header
- * // the offset excluding the one byte header
+ * // the datetime excluding the one byte header
+ * // the offset excluding the one byte header
*
*
* @return the instance of {@code Ser}, not null
diff --git a/src/java.base/share/classes/java/time/OffsetTime.java b/src/java.base/share/classes/java/time/OffsetTime.java
index b4e52743ba5..6301da8946a 100644
--- a/src/java.base/share/classes/java/time/OffsetTime.java
+++ b/src/java.base/share/classes/java/time/OffsetTime.java
@@ -1400,12 +1400,12 @@ public final class OffsetTime
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(9); // identifies an OffsetTime
- * // the time excluding the one byte header
- * // the offset excluding the one byte header
+ * // the time excluding the one byte header
+ * // the offset excluding the one byte header
*
*
* @return the instance of {@code Ser}, not null
diff --git a/src/java.base/share/classes/java/time/Period.java b/src/java.base/share/classes/java/time/Period.java
index 726c52b742b..c0eef02ca1c 100644
--- a/src/java.base/share/classes/java/time/Period.java
+++ b/src/java.base/share/classes/java/time/Period.java
@@ -1041,7 +1041,7 @@ public final class Period
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(14); // identifies a Period
diff --git a/src/java.base/share/classes/java/time/Ser.java b/src/java.base/share/classes/java/time/Ser.java
index 885b43abd83..26cfc0b8ffc 100644
--- a/src/java.base/share/classes/java/time/Ser.java
+++ b/src/java.base/share/classes/java/time/Ser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -139,20 +139,20 @@ final class Ser implements Externalizable {
* in the stream. Refer to each class {@code writeReplace}
* serialized form for the value of the type and sequence of values for the type.
*
*
* @param out the data stream to write to, not null
@@ -223,20 +223,20 @@ final class Ser implements Externalizable {
* {@code Ser} object.
*
*
- * - Duration - {@code Duration.ofSeconds(seconds, nanos);}
- *
- Instant - {@code Instant.ofEpochSecond(seconds, nanos);}
- *
- LocalDate - {@code LocalDate.of(year, month, day);}
- *
- LocalDateTime - {@code LocalDateTime.of(date, time);}
- *
- LocalTime - {@code LocalTime.of(hour, minute, second, nano);}
- *
- MonthDay - {@code MonthDay.of(month, day);}
- *
- OffsetTime - {@code OffsetTime.of(time, offset);}
- *
- OffsetDateTime - {@code OffsetDateTime.of(dateTime, offset);}
- *
- Period - {@code Period.of(years, months, days);}
- *
- Year - {@code Year.of(year);}
- *
- YearMonth - {@code YearMonth.of(year, month);}
- *
- ZonedDateTime - {@code ZonedDateTime.ofLenient(dateTime, offset, zone);}
- *
- ZoneId - {@code ZoneId.of(id);}
- *
- ZoneOffset - {@code (offsetByte == 127 ? ZoneOffset.ofTotalSeconds(in.readInt()) : ZoneOffset.ofTotalSeconds(offsetByte * 900));}
+ *
- Duration - {@code Duration.ofSeconds(seconds, nanos);}
+ *
- Instant - {@code Instant.ofEpochSecond(seconds, nanos);}
+ *
- LocalDate - {@code LocalDate.of(year, month, day);}
+ *
- LocalDateTime - {@code LocalDateTime.of(date, time);}
+ *
- LocalTime - {@code LocalTime.of(hour, minute, second, nano);}
+ *
- MonthDay - {@code MonthDay.of(month, day);}
+ *
- OffsetTime - {@code OffsetTime.of(time, offset);}
+ *
- OffsetDateTime - {@code OffsetDateTime.of(dateTime, offset);}
+ *
- Period - {@code Period.of(years, months, days);}
+ *
- Year - {@code Year.of(year);}
+ *
- YearMonth - {@code YearMonth.of(year, month);}
+ *
- ZonedDateTime - {@code ZonedDateTime.ofLenient(dateTime, offset, zone);}
+ *
- ZoneId - {@code ZoneId.of(id);}
+ *
- ZoneOffset - {@code (offsetByte == 127 ? ZoneOffset.ofTotalSeconds(in.readInt()) : ZoneOffset.ofTotalSeconds(offsetByte * 900));}
*
*
* @param in the data to read, not null
diff --git a/src/java.base/share/classes/java/time/Year.java b/src/java.base/share/classes/java/time/Year.java
index 27dc53dae6e..624e2a0e7a5 100644
--- a/src/java.base/share/classes/java/time/Year.java
+++ b/src/java.base/share/classes/java/time/Year.java
@@ -1088,7 +1088,7 @@ public final class Year
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(11); // identifies a Year
diff --git a/src/java.base/share/classes/java/time/YearMonth.java b/src/java.base/share/classes/java/time/YearMonth.java
index d1fa05b6243..40c88e4f6c5 100644
--- a/src/java.base/share/classes/java/time/YearMonth.java
+++ b/src/java.base/share/classes/java/time/YearMonth.java
@@ -1212,7 +1212,7 @@ public final class YearMonth
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(12); // identifies a YearMonth
diff --git a/src/java.base/share/classes/java/time/ZoneId.java b/src/java.base/share/classes/java/time/ZoneId.java
index 8bd135ab611..7f4ddbd4c8b 100644
--- a/src/java.base/share/classes/java/time/ZoneId.java
+++ b/src/java.base/share/classes/java/time/ZoneId.java
@@ -641,7 +641,7 @@ public abstract class ZoneId implements Serializable {
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(7); // identifies a ZoneId (not ZoneOffset)
diff --git a/src/java.base/share/classes/java/time/ZoneOffset.java b/src/java.base/share/classes/java/time/ZoneOffset.java
index 29b5909a57d..cc7186e8c0c 100644
--- a/src/java.base/share/classes/java/time/ZoneOffset.java
+++ b/src/java.base/share/classes/java/time/ZoneOffset.java
@@ -750,7 +750,7 @@ public final class ZoneOffset
// -----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(8); // identifies a ZoneOffset
diff --git a/src/java.base/share/classes/java/time/ZoneRegion.java b/src/java.base/share/classes/java/time/ZoneRegion.java
index 83f0b43d775..cf92d7459b3 100644
--- a/src/java.base/share/classes/java/time/ZoneRegion.java
+++ b/src/java.base/share/classes/java/time/ZoneRegion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -180,7 +180,7 @@ final class ZoneRegion extends ZoneId implements Serializable {
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(7); // identifies a ZoneId (not ZoneOffset)
diff --git a/src/java.base/share/classes/java/time/ZonedDateTime.java b/src/java.base/share/classes/java/time/ZonedDateTime.java
index 7d50644a3f7..7c89759ed18 100644
--- a/src/java.base/share/classes/java/time/ZonedDateTime.java
+++ b/src/java.base/share/classes/java/time/ZonedDateTime.java
@@ -2224,13 +2224,13 @@ public final class ZonedDateTime
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(6); // identifies a ZonedDateTime
- * // the dateTime excluding the one byte header
- * // the offset excluding the one byte header
- * // the zone ID excluding the one byte header
+ * // the dateTime excluding the one byte header
+ * // the offset excluding the one byte header
+ * // the zone ID excluding the one byte header
*
*
* @return the instance of {@code Ser}, not null
diff --git a/src/java.base/share/classes/java/time/chrono/AbstractChronology.java b/src/java.base/share/classes/java/time/chrono/AbstractChronology.java
index a32ecb78da1..e886975fb6d 100644
--- a/src/java.base/share/classes/java/time/chrono/AbstractChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/AbstractChronology.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -721,7 +721,7 @@ public abstract class AbstractChronology implements Chronology {
//-----------------------------------------------------------------------
/**
* Writes the Chronology using a
- * dedicated serialized form.
+ * dedicated serialized form.
*
* out.writeByte(1); // identifies this as a Chronology
* out.writeUTF(getId());
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
index ac5f7b4bfe3..4460a7a8aa4 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -399,7 +399,7 @@ final class ChronoLocalDateTimeImpl
//-----------------------------------------------------------------------
/**
* Writes the ChronoLocalDateTime using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(2); // identifies a ChronoLocalDateTime
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java
index 646af14d05a..b2b9ddb610f 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -355,7 +355,7 @@ final class ChronoPeriodImpl
//-----------------------------------------------------------------------
/**
* Writes the Chronology using a
- * dedicated serialized form.
+ * dedicated serialized form.
*
* out.writeByte(12); // identifies this as a ChronoPeriodImpl
* out.writeUTF(getId()); // the chronology
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
index abd21eecaf0..aa5f0ab11ff 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -322,7 +322,7 @@ final class ChronoZonedDateTimeImpl
//-----------------------------------------------------------------------
/**
* Writes the ChronoZonedDateTime using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(3); // identifies a ChronoZonedDateTime
diff --git a/src/java.base/share/classes/java/time/chrono/HijrahChronology.java b/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
index bc702a44d07..864cfa941c7 100644
--- a/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -1011,7 +1011,7 @@ public final class HijrahChronology extends AbstractChronology implements Serial
//-----------------------------------------------------------------------
/**
* Writes the Chronology using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(1); // identifies a Chronology
diff --git a/src/java.base/share/classes/java/time/chrono/HijrahDate.java b/src/java.base/share/classes/java/time/chrono/HijrahDate.java
index 48b506044c0..632aca1d73f 100644
--- a/src/java.base/share/classes/java/time/chrono/HijrahDate.java
+++ b/src/java.base/share/classes/java/time/chrono/HijrahDate.java
@@ -663,7 +663,7 @@ public final class HijrahDate
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(6); // identifies a HijrahDate
diff --git a/src/java.base/share/classes/java/time/chrono/IsoChronology.java b/src/java.base/share/classes/java/time/chrono/IsoChronology.java
index 18d73689569..431aaca214c 100644
--- a/src/java.base/share/classes/java/time/chrono/IsoChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/IsoChronology.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -680,7 +680,7 @@ public final class IsoChronology extends AbstractChronology implements Serializa
//-----------------------------------------------------------------------
/**
* Writes the Chronology using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(1); // identifies a Chronology
diff --git a/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java b/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java
index 8cd67a05908..ed2d9172a07 100644
--- a/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -507,7 +507,7 @@ public final class JapaneseChronology extends AbstractChronology implements Seri
//-----------------------------------------------------------------------
/**
* Writes the Chronology using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(1); // identifies a Chronology
diff --git a/src/java.base/share/classes/java/time/chrono/JapaneseDate.java b/src/java.base/share/classes/java/time/chrono/JapaneseDate.java
index 92437c3d714..e6d72ded676 100644
--- a/src/java.base/share/classes/java/time/chrono/JapaneseDate.java
+++ b/src/java.base/share/classes/java/time/chrono/JapaneseDate.java
@@ -725,7 +725,7 @@ public final class JapaneseDate
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(4); // identifies a JapaneseDate
diff --git a/src/java.base/share/classes/java/time/chrono/JapaneseEra.java b/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
index 3d318ea36b0..a9bbc5e276e 100644
--- a/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
+++ b/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
@@ -395,7 +395,7 @@ public final class JapaneseEra
//-----------------------------------------------------------------------
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(5); // identifies a JapaneseEra
diff --git a/src/java.base/share/classes/java/time/chrono/MinguoChronology.java b/src/java.base/share/classes/java/time/chrono/MinguoChronology.java
index fd6fdc3e8cd..647292303e2 100644
--- a/src/java.base/share/classes/java/time/chrono/MinguoChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/MinguoChronology.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -337,7 +337,7 @@ public final class MinguoChronology extends AbstractChronology implements Serial
//-----------------------------------------------------------------------
/**
* Writes the Chronology using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(1); // identifies a Chronology
diff --git a/src/java.base/share/classes/java/time/chrono/MinguoDate.java b/src/java.base/share/classes/java/time/chrono/MinguoDate.java
index c827b662871..b7caf9c6410 100644
--- a/src/java.base/share/classes/java/time/chrono/MinguoDate.java
+++ b/src/java.base/share/classes/java/time/chrono/MinguoDate.java
@@ -487,7 +487,7 @@ public final class MinguoDate
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(8); // identifies a MinguoDate
diff --git a/src/java.base/share/classes/java/time/chrono/Ser.java b/src/java.base/share/classes/java/time/chrono/Ser.java
index 317a7696497..6ecef928d79 100644
--- a/src/java.base/share/classes/java/time/chrono/Ser.java
+++ b/src/java.base/share/classes/java/time/chrono/Ser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -136,18 +136,18 @@ final class Ser implements Externalizable {
* in the stream. Refer to each class {@code writeReplace}
* serialized form for the value of the type and sequence of values for the type.
*
*
* @param out the data stream to write to, not null
@@ -202,18 +202,18 @@ final class Ser implements Externalizable {
* {@code Ser} object.
*
*
- * - HijrahChronology - Chronology.of(id)
- *
- IsoChronology - Chronology.of(id)
- *
- JapaneseChronology - Chronology.of(id)
- *
- MinguoChronology - Chronology.of(id)
- *
- ThaiBuddhistChronology - Chronology.of(id)
- *
- ChronoLocalDateTime - date.atTime(time)
- *
- ChronoZonedDateTime - dateTime.atZone(offset).withZoneSameLocal(zone)
- *
- JapaneseDate - JapaneseChronology.INSTANCE.date(year, month, dayOfMonth)
- *
- JapaneseEra - JapaneseEra.of(eraValue)
- *
- HijrahDate - HijrahChronology chrono.date(year, month, dayOfMonth)
- *
- MinguoDate - MinguoChronology.INSTANCE.date(year, month, dayOfMonth)
- *
- ThaiBuddhistDate - ThaiBuddhistChronology.INSTANCE.date(year, month, dayOfMonth)
+ *
- HijrahChronology - Chronology.of(id)
+ *
- IsoChronology - Chronology.of(id)
+ *
- JapaneseChronology - Chronology.of(id)
+ *
- MinguoChronology - Chronology.of(id)
+ *
- ThaiBuddhistChronology - Chronology.of(id)
+ *
- ChronoLocalDateTime - date.atTime(time)
+ *
- ChronoZonedDateTime - dateTime.atZone(offset).withZoneSameLocal(zone)
+ *
- JapaneseDate - JapaneseChronology.INSTANCE.date(year, month, dayOfMonth)
+ *
- JapaneseEra - JapaneseEra.of(eraValue)
+ *
- HijrahDate - HijrahChronology chrono.date(year, month, dayOfMonth)
+ *
- MinguoDate - MinguoChronology.INSTANCE.date(year, month, dayOfMonth)
+ *
- ThaiBuddhistDate - ThaiBuddhistChronology.INSTANCE.date(year, month, dayOfMonth)
*
*
* @param in the data stream to read from, not null
diff --git a/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java b/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java
index c6938b2c530..982aa57017e 100644
--- a/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -374,7 +374,7 @@ public final class ThaiBuddhistChronology extends AbstractChronology implements
//-----------------------------------------------------------------------
/**
* Writes the Chronology using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(1); // identifies a Chronology
diff --git a/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java b/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java
index 276905c0f37..6db40aa571d 100644
--- a/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java
+++ b/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java
@@ -487,7 +487,7 @@ public final class ThaiBuddhistDate
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
*
* out.writeByte(10); // identifies a ThaiBuddhistDate
diff --git a/src/java.base/share/classes/java/time/zone/Ser.java b/src/java.base/share/classes/java/time/zone/Ser.java
index 31c2f2d2bc1..59196465a88 100644
--- a/src/java.base/share/classes/java/time/zone/Ser.java
+++ b/src/java.base/share/classes/java/time/zone/Ser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -125,9 +125,9 @@ final class Ser implements Externalizable {
* serialized form for the value of the type and sequence of values for the type.
*
*
*
* @param out the data stream to write to, not null
@@ -168,11 +168,11 @@ final class Ser implements Externalizable {
* {@code Ser} object.
*
*
- * - ZoneRules
+ *
- ZoneRules
* - {@code ZoneRules.of(standardTransitions, standardOffsets, savingsInstantTransitions, wallOffsets, lastRules);}
- *
- ZoneOffsetTransition
+ *
- ZoneOffsetTransition
* - {@code ZoneOffsetTransition of(LocalDateTime.ofEpochSecond(epochSecond), offsetBefore, offsetAfter);}
- *
- ZoneOffsetTransitionRule
+ *
- ZoneOffsetTransitionRule
* - {@code ZoneOffsetTransitionRule.of(month, dom, dow, time, timeEndOfDay, timeDefinition, standardOffset, offsetBefore, offsetAfter);}
*
* @param in the data to read, not null
diff --git a/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java b/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java
index 94264f32cce..6d108e277a0 100644
--- a/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java
+++ b/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -190,10 +190,10 @@ public final class ZoneOffsetTransition
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
* Refer to the serialized form of
- * ZoneRules.writeReplace
+ * ZoneRules.writeReplace
* for the encoding of epoch seconds and offsets.
* {@code
*
diff --git a/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java b/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
index 9c700d5ec70..dc95f3ecde4 100644
--- a/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
+++ b/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -249,10 +249,10 @@ public final class ZoneOffsetTransitionRule implements Serializable {
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
* Refer to the serialized form of
- * ZoneRules.writeReplace
+ * ZoneRules.writeReplace
* for the encoding of epoch seconds and offsets.
* {@code
*
diff --git a/src/java.base/share/classes/java/time/zone/ZoneRules.java b/src/java.base/share/classes/java/time/zone/ZoneRules.java
index f2dee70fee6..0cb381da05e 100644
--- a/src/java.base/share/classes/java/time/zone/ZoneRules.java
+++ b/src/java.base/share/classes/java/time/zone/ZoneRules.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -327,7 +327,7 @@ public final class ZoneRules implements Serializable {
/**
* Writes the object using a
- * dedicated serialized form.
+ * dedicated serialized form.
* @serialData
* {@code
*