Minor fixes for America/FCP_QRoo commentary

* NEWS: America/FCP_QRoo also affects current time stamps.
* northamerica: Reformat to fit in 80 characters.
* zone.tab, zone1970.tab: Use "city, state" style for consistency.

4 files changed, 20 insertions, 19 deletions

diff --git a/NEWS b/NEWS
index 729ebbf..1de5a71 100644
--- a/NEWS
+++ b/NEWS
@@ -2,25 +2,25 @@ News for the tz database
 
 Unreleased, experimental changes
 
-  Changes affecting future time stamps
-
-    New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49.
-    (Thanks to Tim Parenti.)
+  Changes affecting current and future time stamps
 
     The Mexican state of Quintana Roo, represented by America/Cancun,
     will shift from Central Time with DST to Eastern Time without DST
     on 2015-02-01 at 02:00.  (Thanks to Steffen Thorsen and Gwillim Law.)
 
+    A new zone America/FCP_QRoo covers portions of Quintana Roo which
+    have observed Eastern Time without DST since 1998.  (Thanks to
+    Gwillim Law and Tim Parenti.)
+
+    New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49.
+    (Thanks to Tim Parenti.)
+
   Changes affecting past time stamps
 
     Iceland observed DST in 1919 and 1921, and its 1939 fallback
     transition was Oct. 29, not Nov. 29.  Remove incorrect data from
     Shanks about time in Iceland between 1837 and 1908.
 
-    A new zone, America/FCP_QRoo, for portions of the Mexican state of
-    Quintana Roo which have observed Eastern Time without DST since 1998.
-    (Thanks to Gwillim Law and Tim Parenti.)
-
     Some more zones have been turned into links, when they differed
     from existing zones only for older time stamps.  As usual,
     these changes affect UTC offsets in pre-1970 time stamps only.
diff --git a/northamerica b/northamerica
index f80178b..ae1290e 100644
--- a/northamerica
+++ b/northamerica
@@ -2317,15 +2317,16 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 #
 # From Tim Parenti (2015-01-18):
 # A new zone for Felipe Carrillo Puerto (FCP) is needed which apparently did not
-# switch to Central Time on 1998-08-02 with Cancún and the rest of Quintana Roo state.
-# Assume that the reference to FCP "refus[ing] to change its time zone" since then
-# refers to a refusal to observe DST, putting it out of sync with Cancún during the
-# winter.  Since there are multiple places within Mexico referred to as Felipe
-# Carrillo Puerto or Quintana Roo, use America/FCP_QRoo to refer to the municipio of
-# FCP inside the state of QRoo, abbreviating to stay under 14 characters.
-#
-# Since Cancún is shifting to EST without DST on 2015-02-01, this brings these regions
-# back into synchronicity with each other.
+# switch to Central Time on 1998-08-02 with Cancún and the rest of Quintana
+# Roo state.  Assume that the reference to FCP "refus[ing] to change its time
+# zone" since then refers to a refusal to observe DST, putting it out of sync
+# with Cancún during the winter.  Since there are multiple places within
+# Mexico referred to as Felipe Carrillo Puerto or Quintana Roo, use
+# America/FCP_QRoo to refer to the municipio of FCP inside the state of QRoo,
+# abbreviating to stay under 14 characters.
+#
+# Since Cancún is shifting to EST without DST on 2015-02-01, this brings these
+# regions back into synchronicity with each other.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
diff --git a/zone.tab b/zone.tab
index 584dc85..403a204 100644
--- a/zone.tab
+++ b/zone.tab
@@ -275,7 +275,7 @@ MV	+0410+07330	Indian/Maldives
 MW	-1547+03500	Africa/Blantyre
 MX	+1924-09909	America/Mexico_City	Central Time - most locations
 MX	+2105-08646	America/Cancun	Eastern Standard Time - most of Quintana Roo
-MX	+1935-08803	America/FCP_QRoo	Eastern Standard Time - Felipe Carrillo Puerto in Quintana Roo
+MX	+1935-08803	America/FCP_QRoo	Eastern Standard Time - Felipe Carrillo Puerto, Quintana Roo
 MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
 MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
 MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
diff --git a/zone1970.tab b/zone1970.tab
index 09e0748..b28a693 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -234,7 +234,7 @@ MU	-2010+05730	Indian/Mauritius
 MV	+0410+07330	Indian/Maldives
 MX	+1924-09909	America/Mexico_City	Central Time - most locations
 MX	+2105-08646	America/Cancun	Eastern Standard Time - most of Quintana Roo
-MX	+1935-08803	America/FCP_QRoo	Eastern Standard Time - Felipe Carrillo Puerto in Quintana Roo
+MX	+1935-08803	America/FCP_QRoo	Eastern Standard Time - Felipe Carrillo Puerto, Quintana Roo
 MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatán
 MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border
 MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border