diff --git a/icu4j/build.xml b/icu4j/build.xml
index 6e6d3d3e15..e03c48d780 100644
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -88,14 +88,13 @@
-
+
+
-
-
-
+
+
-
-
+
@@ -766,6 +765,13 @@
+
+
+
+
+
+
+
@@ -787,20 +793,18 @@
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
-
+ source="1.5"
+ stylesheetfile="${docs.style.sheet}"
+ failonerror="true">
@@ -834,8 +838,8 @@
-
-
+
+
+ source="1.5"
+ failonerror="true">
diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java
index 73dcb527c9..60c5df70ce 100644
--- a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java
@@ -57,7 +57,7 @@ import com.ibm.icu.util.VersionInfo;
* TERTIARY strength: Upper and lower case differences in characters are
* distinguished at tertiary strength (for example, "ao" < "Ao" <
* "aò"). In addition, a variant of a letter differs from the base
-* form on the tertiary strength (such as "A" and "Ⓐ"). Another
+* form on the tertiary strength (such as "A" and "Ⓐ"). Another
* example is the
* difference between large and small Kana. A tertiary difference is ignored
* when there is a primary or secondary difference anywhere in the strings.
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/CopticCalendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/CopticCalendar.java
index 804f5b13cb..f2654b983f 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/CopticCalendar.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/CopticCalendar.java
@@ -1,6 +1,6 @@
/*
*******************************************************************************
- * Copyright (C) 2005-2014, International Business Machines Corporation and *
+ * Copyright (C) 2005-2016, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -26,93 +26,91 @@ public final class CopticCalendar extends CECalendar
private static final long serialVersionUID = 5903818751846742911L;
/**
- * Constant for ωογτ/تﻮﺗ,
+ * Constant for ωογτ / تﻮﺗ,
* the 1st month of the Coptic year.
* @stable ICU 3.4
*/
public static final int TOUT = 0;
/**
- * Constant for Παοπι/ﻪﺑﺎﺑ,
+ * Constant for Παοπι / ﻪﺑﺎﺑ,
* the 2nd month of the Coptic year.
* @stable ICU 3.4
*/
public static final int BABA = 1;
/**
- * Constant for Αθορ/رﻮﺗﺎﻫ,
+ * Constant for Αθορ / رﻮﺗﺎﻫ,
* the 3rd month of the Coptic year.
* @stable ICU 3.4
*/
public static final int HATOR = 2;
/**
- * Constant for Χοιακ/ﻚﻬﻴﻛ,
+ * Constant for Χοιακ / ﻚﻬﻴﻛ;,
* the 4th month of the Coptic year.
* @stable ICU 3.4
*/
public static final int KIAHK = 3;
/**
- * Constant for Τωβι/طﻮﺒﻫ,
+ * Constant for Τωβι / طﻮﺒﻫ,
* the 5th month of the Coptic year.
* @stable ICU 3.4
*/
public static final int TOBA = 4;
/**
- * Constant for Μεϣιρ/ﺮﻴﺸﻣأ,
+ * Constant for Μεϣιρ / ﺮﻴﺸﻣأ,
* the 6th month of the Coptic year.
* @stable ICU 3.4
*/
public static final int AMSHIR = 5;
/**
- * Constant for Παρεμϩατ/تﺎﻬﻣﺮﺑ,
+ * Constant for Παρεμϩατ / تﺎﻬﻣﺮﺑ,
* the 7th month of the Coptic year.
* @stable ICU 3.4
*/
public static final int BARAMHAT = 6;
/**
- * Constant for Φαρμοθι/هدﻮﻣﺮﺑ,
+ * Constant for Φαρμοθι / هدﻮﻣﺮﺑ,
* the 8th month of the Coptic year.
* @stable ICU 3.4
*/
public static final int BARAMOUDA = 7;
/**
- * Constant for Παϣαν/ﺲﻨﺸﺑ,
+ * Constant for Παϣαν / ﺲﻨﺸﺑ;,
* the 9th month of the Coptic year.
* @stable ICU 3.4
*/
public static final int BASHANS = 8;
/**
- * Constant for Παωνι/ﻪﻧؤﻮﺑ,
+ * Constant for Παωνι / ﻪﻧؤﻮﺑ,
* the 10th month of the Coptic year.
* @stable ICU 3.4
*/
public static final int PAONA = 9;
/**
- * Constant for Επηπ/ﺐﻴﺑأ,
+ * Constant for Επηπ / ﺐﻴﺑأ,
* the 11th month of the Coptic year.
* @stable ICU 3.4
*/
public static final int EPEP = 10;
/**
- * Constant for Μεϲωρη/ىﺮﺴﻣ,
+ * Constant for Μεϲωρη / ىﺮﺴﻣ,
* the 12th month of the Coptic year.
* @stable ICU 3.4
*/
public static final int MESRA = 11;
/**
- * Constant for Πικογϫι
- * μαβοτ/ﺮﻴﻐﺼﻟا
- * ﺮﻬﺸﻟا,
+ * Constant for Πικογϫι μαβοτ / ﺮﻴﻐﺼﻟاﺮﻬﺸﻟا,
* the 13th month of the Coptic year.
* @stable ICU 3.4
*/
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/EthiopicCalendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/EthiopicCalendar.java
index 72ea37a21b..0cf3a16ccb 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/EthiopicCalendar.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/EthiopicCalendar.java
@@ -1,6 +1,6 @@
/*
*******************************************************************************
- * Copyright (C) 2005-2014, International Business Machines Corporation and
+ * Copyright (C) 2005-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@@ -29,79 +29,79 @@ public final class EthiopicCalendar extends CECalendar
private static final long serialVersionUID = -2438495771339315608L;
/**
- * Constant for መስከረም, the 1st month of the Ethiopic year.
+ * Constant for መስከረም, the 1st month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int MESKEREM = 0;
/**
- * Constant for ጥቅምት, the 2nd month of the Ethiopic year.
+ * Constant for ጥቅምት, the 2nd month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int TEKEMT = 1;
/**
- * Constant for ኅዳር, the 3rd month of the Ethiopic year.
+ * Constant for ኅዳር, the 3rd month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int HEDAR = 2;
/**
- * Constant for ታኅሣሥ, the 4th month of the Ethiopic year.
+ * Constant for ታኅሣሥ, the 4th month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int TAHSAS = 3;
/**
- * Constant for ጥር, the 5th month of the Ethiopic year.
+ * Constant for ጥር, the 5th month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int TER = 4;
/**
- * Constant for የካቲት, the 6th month of the Ethiopic year.
+ * Constant for የካቲት, the 6th month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int YEKATIT = 5;
/**
- * Constant for መጋቢት, the 7th month of the Ethiopic year.
+ * Constant for መጋቢት, the 7th month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int MEGABIT = 6;
/**
- * Constant for ሚያዝያ, the 8th month of the Ethiopic year.
+ * Constant for ሚያዝያ, the 8th month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int MIAZIA = 7;
/**
- * Constant for ግንቦት, the 9th month of the Ethiopic year.
+ * Constant for ግንቦት, the 9th month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int GENBOT = 8;
/**
- * Constant for ሰኔ, the 10th month of the Ethiopic year.
+ * Constant for ሰኔ, the 10th month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int SENE = 9;
/**
- * Constant for ሐምሌ, the 11th month of the Ethiopic year.
+ * Constant for ሐምሌ, the 11th month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int HAMLE = 10;
/**
- * Constant for ነሐሴ, the 12th month of the Ethiopic year.
+ * Constant for ነሐሴ, the 12th month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int NEHASSE = 11;
/**
- * Constant for ጳጉሜን, the 13th month of the Ethiopic year.
+ * Constant for ጳጉሜን, the 13th month of the Ethiopic year.
* @stable ICU 3.4
*/
public static final int PAGUMEN = 12;