From 3bf7d64959aa92db79c5748f97650b890013e525 Mon Sep 17 00:00:00 2001
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Sun, 23 Apr 1995 21:24:54 +0000
Subject: [PATCH] Added parseable comments describing the zone each entry
 represents.

---
 share/zoneinfo/africa       | 115 ++++++++++++++++++++++++++++++++++++
 share/zoneinfo/asia         |  95 +++++++++++++++++++++++++++++
 share/zoneinfo/australasia  |  78 ++++++++++++++++++++++++
 share/zoneinfo/northamerica | 100 +++++++++++++++++++++++++++++++
 share/zoneinfo/southamerica |  36 +++++++++++
 5 files changed, 424 insertions(+)

diff --git a/share/zoneinfo/africa b/share/zoneinfo/africa
index c3f74b17dbe7..04dcc4ce0f76 100644
--- a/share/zoneinfo/africa
+++ b/share/zoneinfo/africa
@@ -104,12 +104,16 @@ Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15 0:01
 			0:00	Algeria	WET%s	1981 May
 			1:00	-	MET
 
+# ZONE-DESCR Africa Algiers Algeria All points
+
 # Angola
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Luanda	0:52:56	-	LMT	1892
 			0:52	-	LMT	1911 May 26 # Luanda Mean Time
 			1:00	-	CAT
 
+# ZONE-DESCR Africa Luanda Angola All points
+
 # Benin
 # Whitman says they switched to 1:00 in 1946, not 1934; go with Shanks.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -117,6 +121,8 @@ Zone Africa/Porto-Novo	0:10:28	-	LMT	1912
 			0:00	-	WAT	1934 Feb 26
 			1:00	-	CAT
 
+# ZONE-DESCR Africa Porto-Novo Benin All points
+
 # Botswana
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Gaborone	1:43:40 -	LMT	1885
@@ -124,22 +130,30 @@ Zone	Africa/Gaborone	1:43:40 -	LMT	1885
 			2:00	1:00	SAST	1944 Mar 19 2:00
 			2:00	-	SAT
 
+# ZONE-DESCR Africa Gaborone Botswana All points
+
 # Burkina Faso
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
 			 0:00	-	WAT
 
+# ZONE-DESCR Africa Ouagadougou Burkina_Faso All points
+
 # Burundi
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Bujumbura	1:57:28	-	LMT	1890
 			2:00	-	SAT
 
+# ZONE-DESCR Africa Bujumbura Burundi All points
+
 # Cameroon
 # Whitman says they switched to 1:00 in 1920; go with Shanks.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Douala	0:38:48	-	LMT	1912
 			1:00	-	CAT
 
+# ZONE-DESCR Africa Douala Cameroon All points
+
 # Cape Verde
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907			# Praia
@@ -148,11 +162,15 @@ Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907			# Praia
 			-2:00	-	CVT	1975 Nov 25 2:00
 			-1:00	-	AAT
 
+# ZONE-DESCR Africa Cape_Verde Cape_Verde All points
+
 # Central African Republic
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Bangui	1:14:20	-	LMT	1912
 			1:00	-	CAT
 
+# ZONE-DESCR Africa Bangui Central_African_Republic All points
+
 # Chad
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
@@ -160,26 +178,36 @@ Zone	Africa/Ndjamena	1:00:12 -	LMT	1912
 			1:00	1:00	CAST	1980 Mar  8
 			1:00	-	CAT
 
+# ZONE-DESCR Africa Ndjamena Chad All points
+
 # Comoros
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul   # Moroni, Gran Comoro
 			3:00	-	EAT
 
+# ZONE-DESCR Indian Comoro Comoros_Islands All points
+
 # Congo
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Brazzaville	1:01:08 -	LMT	1912
 			1:00	-	CAT
 
+# ZONE-DESCR Africa Brazzaville Congo All points
+
 # Cote D'Ivoire
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	WAT
 
+# ZONE-DESCR Africa Abidjan Ivory_Coast All points
+
 # Djibouti
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul
 			3:00	-	EAT
 
+# ZONE-DESCR Africa Djibouti Djibouti All points
+
 ###############################################################################
 
 # Egypt
@@ -221,12 +249,16 @@ Rule	Egypt	1990	max	-	May	 1	1:00	1:00	" DST"
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct
 			2:00	Egypt	EET%s
 
+# ZONE-DESCR Africa Cairo Egypt All points
+
 # Equatorial Guinea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Malabo	0:35:08 -	LMT	1912
 			0:00	-	WAT	1963 Dec 15
 			1:00	-	CAT
 
+# ZONE-DESCR Africa Malabo Equatorial_Guinea All points
+
 # Eritrea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Asmera	2:35:32 -	LMT	1870
@@ -234,17 +266,23 @@ Zone	Africa/Asmera	2:35:32 -	LMT	1870
 			2:35	-	AAMT	1936 May 5    # Addis Ababa MT
 			3:00	-	EAT
 
+# ZONE-DESCR Africa Asmera Eritrea All points
+
 # Ethiopia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
 			2:35	-	AAMT	1936 May 5    # Addis Ababa MT
 			3:00	-	EAT
 
+# ZONE-DESCR Africa Addis_Ababa Ethiopia All points
+
 # Gabon
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Libreville	0:37:48 -	LMT	1912
 			1:00	-	CAT
 
+# ZONE-DESCR Africa Libreville Gabon All points
+
 # Gambia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Banjul	-1:06:36 -	LMT	1912
@@ -252,6 +290,8 @@ Zone	Africa/Banjul	-1:06:36 -	LMT	1912
 			-1:00	-	AAT	1964
 			 0:00	-	WAT
 
+# ZONE-DESCR Africa Banjul Gambia All points
+
 # Ghana
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
 # WATDT is my invention for ``West Africa one-Third Daylight Time''.
@@ -265,6 +305,8 @@ Rule	Ghana	1936	1942	-	Dec	31	0:00	0	WAT
 Zone	Africa/Accra	-0:00:52 -	LMT	1918
 			 0:00	Ghana	%s
 
+# ZONE-DESCR Africa Accra Ghana All points
+
 # Guinea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Conakry	-0:54:52 -	LMT	1912
@@ -272,12 +314,16 @@ Zone	Africa/Conakry	-0:54:52 -	LMT	1912
 			 1:00	-	CAT	1960
 			 0:00	-	WAT
 
+# ZONE-DESCR Africa Conakry Guinea All points
+
 # Guinea-Bissau
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Bissau	-1:02:20 -	LMT	1911 May 26
 			 1:00	-	CAT	1975
 			 0:00	-	WAT
 
+# ZONE-DESCR Africa Bissau Guinea_Bissau All points
+
 # Kenya
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
 # Shanks says the transition to 2:45 was in 1940, but it must have been 1948.
@@ -288,6 +334,8 @@ Zone	Africa/Nairobi	2:27:16	-	LMT	1928 Jul
 			2:45	-	BEAT	1960
 			3:00	-	EAT
 
+# ZONE-DESCR Africa Nairobi Kenya All points
+
 # Lesotho
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
@@ -295,6 +343,8 @@ Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
 			2:00	1:00	SAST	1944 Mar 19 2:00
 			2:00	-	SAT
 
+# ZONE-DESCR Africa Maseru Lesotho All points
+
 # Liberia
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
 # In 1972 Liberia was the last country to switch
@@ -310,6 +360,8 @@ Zone	Africa/Monrovia	-0:43:08 -	LMT	1882
 			-0:44:30 -	LST	1972 May # Liberia Standard Time
 			 0:00	-	WAT
 
+# ZONE-DESCR Africa Monrovia Liberia All points
+
 ###############################################################################
 
 # Libya
@@ -349,6 +401,8 @@ Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 			2:00	-	EET	1982
 			1:00	Libya	MET%s
 
+# ZONE-DESCR Africa Tripoli Libya All points
+
 # Madagascar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Indian/Antananarivo 3:10:04 -	LMT	1911 Jul
@@ -356,17 +410,24 @@ Zone Indian/Antananarivo 3:10:04 -	LMT	1911 Jul
 			3:00	1:00	EAST	1954 May 29 23:00s
 			3:00	-	EAT
 
+# ZONE-DESCR Indian Antananarivo Madagascar All points
+
 # Malawi
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
 			2:00	-	SAT
 
+# ZONE-DESCR Africa Blantyre Malawi All points
+
 # Mali
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Bamako	-0:32:00 -	LMT	1912
 			 0:00	-	WAT	1934 Feb 26
 			-1:00	-	AAT	1960 Jun 20
 			 0:00	-	WAT
+
+# ZONE-DESCR Africa Bamako Mali All points
+
 # no longer different from Bamako, but too famous to omit
 Zone	Africa/Timbuktu	-0:12:04 -	LMT	1912
 			 0:00	-	WAT
@@ -377,6 +438,7 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
 			 0:00	-	WAT	1934 Feb 26
 			-1:00	-	AAT	1960 Jun 20
 			 0:00	-	WAT
+# ZONE-DESCR Africa Noukachott Mauritania All points
 
 # Mauritius
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -385,11 +447,15 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907		# Port Louis
 # Agalega Is, Rodriguez
 # no information; probably like Indian/Mauritius
 
+# ZONE-DESCR Indian Mauritius Mauritius All points
+
 # Mayotte
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Mayotte	3:01:08 -	LMT	1911 Jul	# Dzaoudzi
 			3:00	-	EAT
 
+# ZONE-DESCR Indian Mayotte Mayotte All points
+
 # Morocco
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Morocco	1913	only	-	Oct	26	 0:00	0	-
@@ -413,6 +479,9 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WET%s	1984 Mar 16
 			 1:00	-	MET	1986
 			 0:00	-	WET
+
+# ZONE-DESCR Africa Casablanca Morocco All points
+
 # The following are controlled by Spain, and are like Europe/Madrid:
 # Alboran, Alhucemas Is, Ceuta, Chafarinas Is, Mellila.
 
@@ -421,6 +490,8 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 Zone	Africa/Maputo	2:10:20 -	LMT	1903 Mar
 			2:00	-	SAT
 
+# ZONE-DESCR Africa Maputo Mozambique All points
+
 # Namibia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
@@ -429,6 +500,8 @@ Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
 			2:00	1:00	SAST	1943 Mar 21 2:00
 			2:00	-	SAT
 
+# ZONE-DESCR Africa Windhoek Namibia All points
+
 # Niger
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Niamey	0:08:28 -	LMT	1912
@@ -436,21 +509,29 @@ Zone	Africa/Niamey	0:08:28 -	LMT	1912
 			0:00	-	WAT	1960
 			1:00	-	CAT
 
+# ZONE-DESCR Africa Niamey Niger All points
+
 # Nigeria
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
 			1:00	-	CAT
 
+# ZONE-DESCR Africa Lagos Nigeria All points
+
 # Reunion
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun	# St Denis
 			4:00	-	SMT
 
+# ZONE-DESCR Indian Reunion Reunion_Island All points
+
 # Rwanda
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Kigali	2:00:16 -	LMT	1935 Jun
 			2:00	-	SAT
 
+# ZONE-DESCR Africa Kigali Rwanda All points
+
 # St Helena
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890		# Jamestown
@@ -461,23 +542,31 @@ Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890		# Jamestown
 # Ascension, Gough, Inaccessible, Nightingale
 # no information; probably like Atlantic/St_Helena
 
+# ZONE-DESCR Atlantic St_Helena St_Helena All points
+
 # Sao Tome and Principe
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
 			-0:37	-	?MT	1912	# a typo in Shanks?
 			 0:00	-	WAT
 
+# ZONE-DESCR Africa Sao_Tome Sao_Tome_and_Principe All points
+
 # Senegal
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Dakar	-1:09:44 -	LMT	1912
 			-1:00	-	AAT	1941 Jun
 			 0:00	-	WAT
 
+# ZONE-DESCR Africa Dakar Senegal All points
+
 # Seychelles
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun	# Victoria
 			4:00	-	SMT
 
+# ZONE-DESCR Indian Mahe Seychelles All points
+
 # Sierra Leone
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	SL	1913	only	-	Oct	26	0:00	0	-
@@ -492,6 +581,8 @@ Zone	Africa/Freetown	-0:53:00 -	LMT	1882
 			-1:00	SL	AA%sT	1957
 			 0:00	SL	WA%sT
 
+# ZONE-DESCR Africa Freetown Sierra_Leone All points
+
 # Somalia
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
 # Shanks omits the 1948 transition to 2:45; this is probably a typo.
@@ -502,6 +593,8 @@ Zone Africa/Mogadishu	3:01:28 -	LMT	1893 Nov
 			2:45	-	BEAT	1957	# not in Shanks
 			3:00	-	EAT
 
+# ZONE-DESCR Africa Mogadishu Somalia All points
+
 # South Africa
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	SA	1892	only	-	Feb	8	0:00	0	-
@@ -511,6 +604,9 @@ Rule	SA	1943	1944	-	Mar	Sun>=15	2:00	0	-
 Zone Africa/Johannesburg 1:52:00 -	LMT	1892 Feb 8
 			1:30	-	SAT	1903 Mar
 			2:00	SA	SA%sT
+
+# ZONE-DESCR Africa Johannesburg South_Africa All points
+
 # Prince Edward Is
 # no information
 
@@ -525,11 +621,15 @@ Rule	Sudan	1972	max	-	Apr	lastSun	0:00	1:00	" DST"
 Zone	Africa/Khartoum	2:10:08 -	LMT	1931
 			2:00	Sudan	EET%s
 
+# ZONE-DESCR Africa Khartoum Sudan All points
+
 # Swaziland
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Mbabane	2:04:24 -	LMT	1903 Mar
 			2:00	-	SAT
 
+# ZONE-DESCR Africa Mbabane Swaziland All points
+
 # Tanzania
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
@@ -537,11 +637,15 @@ Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
 			2:45	-	BEAT	1961
 			3:00	-	EAT
 
+# ZONE-DESCR Africa Dar_es_Salaam Tanzania All points
+
 # Togo
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Lome	0:04:52 -	LMT	1893
 			0:00	-	WAT
 
+# ZONE-DESCR Africa Lome Togo All points
+
 # Tunisia
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Tunisia	1911	only	-	Mar	 9	 0:00	0	-
@@ -573,6 +677,8 @@ Zone	Africa/Tunis	0:40:44 -	LMT	1881 May 12
 			0:09:05	-	PMT	1911 Mar  9    # Paris Mean Time
 			1:00	Tunisia	MET%s
 
+# ZONE-DESCR Africa Tunis Tunisia All points
+
 # Uganda
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
@@ -581,6 +687,8 @@ Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
 			2:45	-	BEAT	1957
 			3:00	-	EAT
 
+# ZONE-DESCR Africa Kampala Uganda All points
+
 # Zaire
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov 9
@@ -588,12 +696,19 @@ Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov 9
 Zone Africa/Lumumbashi	1:49:52 -	LMT	1897 Nov 9
 			2:00	-	SAT
 
+# ZONE-DESCR Africa Kinshasa Zaire Western (Kinshasa)
+# ZONE-DESCR Africa Lumumbashi Zaire Eastern (Lumumbashi)
+
 # Zambia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Lusaka	1:53:08 -	LMT	1903 Mar
 			2:00	-	SAT
 
+# ZONE-DESCR Africa Lusaka Zambia All points
+
 # Zimbabwe
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Harare	2:04:12 -	LMT	1903 Mar
 			2:00	-	SAT
+
+# ZONE-DESCR Africa Harare Zimbabwe All points
diff --git a/share/zoneinfo/asia b/share/zoneinfo/asia
index 60166c1f34ff..ab43142bb8a8 100644
--- a/share/zoneinfo/asia
+++ b/share/zoneinfo/asia
@@ -80,24 +80,32 @@ Zone	Asia/Kabul	4:36:48 -	LMT	1890
 			4:00	-	GST	1945
 			4:30	-	AFT
 
+# ZONE-DESCR Asia Kabul Afghanistan All points
+
 # Armenia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
 			3:00	-	MSK	1957 Mar
 			4:00	Russia	BS%s
 
+# ZONE-DESCR Asia Yerevan Armenia All points
+
 # Azerbaijan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
 			3:00	-	MSK	1957 Mar
 			4:00	Russia	BS%s
 
+# ZONE-DESCR Asia Baku Azerbaijan All points
+
 # Bahrain
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Bahrain	3:22:20 -	LMT	1920		# Al-Manamah
 			4:00	-	GST	1972 Jun
 			3:00	-	AST
 
+# ZONE-DESCR Asia Bahrain All points
+
 # Bangladesh
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dacca	6:01:40 -	LMT	1890
@@ -107,23 +115,31 @@ Zone	Asia/Dacca	6:01:40 -	LMT	1890
 			6:30	-	BMT	1951 Sep 30
 			6:00	-	BGT
 
+# ZONE-DESCR Asia Dacca Bangladesh All points
+
 # Bhutan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Thimbu	5:58:36 -	LMT	1947 Aug 15
 			5:30	-	IST	1987 Oct
 			6:00	-	BGT
 
+# ZONE-DESCR Asia Thimbu Bhutan All points
+
 # British Indian Ocean Territory
 # From Whitman:
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Chagos	5:00	-	PKT
 
+# ZONE-DESCR Indian Chagos British_Indian_Ocean_Terr All points
+
 # Brunei
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar   # Bandar Seri Begawan
 			7:30	-	BNT	1933
 			8:00	-	BNT
 
+# ZONE-DESCR Asia Brunei Brunei All points
+
 # Burma
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Rangoon	6:24:40 -	LMT	1880
@@ -132,6 +148,8 @@ Zone	Asia/Rangoon	6:24:40 -	LMT	1880
 			9:00	-	JST	1945 May 3
 			6:30	-	BMT
 
+# ZONE-DESCR Asia Rangoon Myanmar All points
+
 # Cambodia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jun  9
@@ -140,6 +158,8 @@ Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jun  9
 			8:00	-	ICT	1931 May
 			7:00	-	ICT
 
+# ZONE-DESCR Asia Phonm_Penh Cambodia All points
+
 # People's Republic of China
 
 # From Guy Harris:
@@ -188,6 +208,8 @@ Zone	Asia/Shanghai	8:05:52	-	LMT	1928
 			8:00	Shang	C%sT	1949
 			8:00	PRC	C%sT
 
+# ZONE-DESCR Asia Shanghai China All points
+
 ###############################################################################
 
 # Republic of China
@@ -209,6 +231,8 @@ Rule	Taiwan	1980	only	-	Sep	30	0:00	0	S
 Zone	Asia/Taipei	8:06:00 -	LMT	1896
 			8:00	Taiwan	C%sT
 
+# ZONE-DESCR Asia Taipei Taiwan All points
+
 ###############################################################################
 # Hong Kong
 # Presumably Hong Kong will have DST again when it merges with China,
@@ -234,6 +258,8 @@ Rule	HK	1979	1980	-	Oct	Sun>=16	3:30	0	-
 Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 Oct 30
 			8:00	HK	HK%sT
 
+# ZONE-DESCR Asia Hong_Kong Hong_Kong All points
+
 # Macao
 # Presumably Macao will have DST again when it merges with China,
 # but it's too early to predict the details.
@@ -257,6 +283,7 @@ Rule	Macao	1978	1980	-	Oct	Sun>=15	0:00	0	S
 Zone	Asia/Macao	7:34:20 -	LMT	1912
 			8:00	Macao	C%sT
 
+# ZONE-DESCR Asia Macao Macao All points
 
 ###############################################################################
 
@@ -276,6 +303,8 @@ Rule	Cyprus	1981	max	-	Mar	lastSun	0:00	1:00	" DST"
 Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
 			2:00	Cyprus	EET%s
 
+# ZONE-DESCR Asia Cyprus Cyprus All points
+
 # Georgia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tbilisi	2:59:16 -	LMT	1880
@@ -283,6 +312,8 @@ Zone	Asia/Tbilisi	2:59:16 -	LMT	1880
 			3:00	-	MSK	1957 Mar
 			4:00	Russia	BS%s
 
+# ZONE-DESCR Asia Tbilisi Georgia All points
+
 # India
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Calcutta	5:53:28 -	LMT	1880
@@ -296,6 +327,8 @@ Zone	Asia/Calcutta	5:53:28 -	LMT	1880
 #	Lakshadweep (Laccadive, Minicoy and Amindivi Is)
 #	Nicobar Is
 
+# ZONE-DESCR Asia Calcutta India All points
+
 # Indonesia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Asia/Jakarta	7:07:12 -	LMT	1867 Aug 10
@@ -317,6 +350,10 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 			9:30	-	CST	1964
 			9:00	-	MLT
 
+# ZONE-DESCR Asia Jakarta Indonesia Jakarta
+# ZONE-DESCR Asia Ujung_Pandang Indonesia Ujung Pandang
+# ZONE-DESCR Asia Jayapura Indonesia Jayapura
+
 # Iran
 
 # Shanks has no record of DST after 1980.
@@ -345,6 +382,8 @@ Zone	Asia/Tehran	3:25:44	-	LMT	1916
 			4:00	Iran	G%sT	1979
 			3:30	Iran	I%sT
 
+# ZONE-DESCR Asia Tehran Iran All points
+
 # Iraq
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Iraq	1982	only	-	May	1	0:00	1:00	D
@@ -359,6 +398,7 @@ Zone	Asia/Baghdad	2:57:40	-	LMT	1890
 			3:00	-	AST	1982 May
 			3:00	Iraq	A%sT
 
+# ZONE-DESCR Asia Baghdad Iraq All points
 
 ###############################################################################
 
@@ -463,6 +503,7 @@ Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
 			2:21	-	JMT	1918
 			2:00	Zion	I%sT
 
+# ZONE-DESCR Asia Tel_Aviv Israel All points
 
 ###############################################################################
 
@@ -485,6 +526,8 @@ Zone	Asia/Tokyo	9:19:04	-	LMT	1896
 #Zone Asia/South_Ryukyu	8:14:44	-	LMT	1896	# Amitori
 #			8:00	-	CST
 
+# ZONE-DESCR Asia Tokyo Japan All points
+
 # Jordan
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
 # Most likely Shanks is merely guessing dates from 1992 on.
@@ -512,6 +555,8 @@ Rule    Jordan	1992	max	-	Oct	Fri>=1	0:00	0	-
 Zone	Asia/Amman	2:23:44 -	LMT	1931
 			2:00	Jordan	EET%s
 
+# ZONE-DESCR Asia Amman Jordan All points
+
 # Kazakhstan
 # From Shanks (1991):
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -519,6 +564,7 @@ Zone	Asia/Alma-Ata	5:07:48 -	LMT	1924 May  2
 			5:00	-	TSK	1957 Mar
 			6:00	Russia	TS%s
 
+# ZONE-DESCR Asia Alma-Ata Kazakhstan All points
 
 ###############################################################################
 
@@ -553,6 +599,9 @@ Zone	Asia/Pyongyang	8:23:00 -	LMT	1890
 			8:00	-	KST	1961 Aug 10
 			9:00	-	KST
 
+# ZONE-DESCR Asia Seoul South_Korea All points
+# ZONE-DESCR Asia Pyongyang North_Korea All points
+
 ###############################################################################
 
 
@@ -561,12 +610,16 @@ Zone	Asia/Pyongyang	8:23:00 -	LMT	1890
 Zone	Asia/Kuwait	3:11:56 -	LMT	1950
 			3:00	-	AST
 
+# ZONE-DESCR Asia Kuwait Kuwait All points
+
 # Kyrgyzstan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Frunze	4:58:24 -	LMT	1924 May  2
 			5:00	-	TSK	1957 Mar
 			6:00	Russia	TS%s
 
+# ZONE-DESCR Asia Frunze Kyrgyzstan All points
+
 # Laos
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jun  9
@@ -575,6 +628,8 @@ Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jun  9
 			8:00	-	ICT	1931 May
 			7:00	-	ICT
 
+# ZONE-DESCR Asia Vientiane Laos All points
+
 # Lebanon
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Lebanon	1880	only	-	Jan	1	0:00	0	-
@@ -602,6 +657,8 @@ Rule	Lebanon	1990	max	-	May	1	0:00	1:00	" DST"
 Zone	Asia/Beirut	2:22:00 -	LMT	1880
 			2:00	Lebanon	EET%s
 
+# ZONE-DESCR Asia Beirut Lebanon All points
+
 # Malaysia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Asia/Kuala_Lumpur	6:46:48 -	LMT	1880
@@ -613,12 +670,16 @@ Zone Asia/Kuala_Lumpur	6:46:48 -	LMT	1880
 			7:30	-	SGT	1982 May
 			8:00	-	SGT
 
+# ZONE-DESCR Asia Kuala_Lumpur Malaysia All points
+
 # Maldives
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Maldives	4:54:00 -	LMT	1880			# Male
 			4:54	-	MMT	1960
 			5:00	-	PKT
 
+# ZONE-DESCR Indian Maldives Maldives All points
+
 # Mongolia
 # Let's comment out the western and eastern Mongolian time zones
 # till we know what their principal towns are.
@@ -639,17 +700,23 @@ Zone	Asia/Ulan_Bator	7:07:32 -	LMT	1905 Aug
 #			8:00	-	BST	1978
 #			9:00	Mongol	B%sT
 
+# ZONE-DESCR  Asia Ulan_Bator Mongolia Central zone
+
 # Nepal
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Katmandu	5:41:16 -	LMT	1920
 			5:30	-	IST	1986
 			5:45	-	NPT
 
+# ZONE-DESCR Asia Katmandu Nepal All points
+
 # Oman
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Muscat	3:54:20 -	LMT	1920
 			4:00	-	GST
 
+# ZONE-DESCR Asia Muscat Oman All points 
+
 # Pakistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
@@ -658,6 +725,8 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1951 Sep 30
 			5:00	-	PKT
 
+# ZONE-DESCR Asia Karachi Pakistan All points
+
 # Palestine
 # These rules for Egypt are stolen from the `africa' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -692,17 +761,23 @@ Zone	Asia/Manila	-15:56:00 -	LMT	1844
 			9:00	-	JST	1944 Nov
 			8:00	Phil	P%sT
 
+# ZONE-DESCR Asia Manila Philippines All points
+
 # Qatar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Qatar	3:26:08 -	LMT	1920		# Al Dawhah
 			4:00	-	GST	1972 Jun
 			3:00	-	AST
 
+# ZONE-DESCR Asia Qatar Qatar All points
+
 # Saudi Arabia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Riyadh	3:06:52 -	LMT	1950
 			3:00	-	AST
 
+# ZONE-DESCR Asia Riyadh Saudi_Arabia All points
+
 # Singapore
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Singapore	6:55:24 -	LMT	1880
@@ -714,6 +789,8 @@ Zone	Asia/Singapore	6:55:24 -	LMT	1880
 			7:30	-	SGT	1982 May
 			8:00	-	SGT
 
+# ZONE-DESCR Asia Singapore Singapore All points
+
 # Sri Lanka
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Colombo	5:19:24 -	LMT	1880
@@ -723,6 +800,8 @@ Zone	Asia/Colombo	5:19:24 -	LMT	1880
 			5:30	1:00	IST	1945 Oct 16 2:00
 			5:30	-	IST
 
+# ZONE-DESCR Asia Colombo Sri_Lanka All points
+
 # Syria
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Syria	1920	only	-	Jan	1	0:00	0	-
@@ -753,35 +832,47 @@ Rule	Syria	1990	max	-	Sep	30	2:00	0	-
 Zone	Asia/Damascus	2:25:12 -	LMT	1920
 			2:00	Syria	EET%s
 
+# ZONE-DESCR Asia Damascus Syria All points
+
 # Tajikistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
 			5:00	-	TSK	1957 Mar
 			6:00	Russia	TS%s
 
+# ZONE-DESCR Asia Dushanbe Tajikistan All points
+
 # Thailand
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Bangkok	6:42:04	-	LMT	1880
 			6:42	-	BMT	1920 Apr
 			7:00	-	ICT
 
+# ZONE-DESCR Asia Bangkok Thailand All points
+
 # Turkmenistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Ashkhabad	3:53:32 -	LMT	1924 May  2
 			4:00	-	ASK	1957 Mar
 			5:00	Russia	AS%s
 
+# ZONE-DESCR Asia Ashkhabad Turkmenistan All points
+
 # United Arab Emirates
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dubai	3:41:12 -	LMT	1920
 			4:00	-	GST
 
+# ZONE-DESCR Asia Dubai U_A_E All points
+
 # Uzbekistan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tashkent	4:37:12 -	LMT	1924 May  2
 			5:00	-	TSK	1957 Mar
 			6:00	Russia	TS%s
 
+# ZONE-DESCR Asia Tashkent Uzbekistan All points
+
 # Vietnam
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
 # Saigon's official name is Thanh-Pho Ho Chi Minh, but it's too long.
@@ -794,7 +885,11 @@ Zone	Asia/Saigon	7:06:40 -	LMT	1906 Jun  9
 			8:00	-	ICT	1931 May
 			7:00	-	ICT
 
+# ZONE-DESCR Asia Saigon Vietnam All points
+
 # Yemen
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Aden	3:00:48	-	LMT	1950
 			3:00	-	AST
+
+# ZONE-DESCR Asia Aden Yemen All points
diff --git a/share/zoneinfo/australasia b/share/zoneinfo/australasia
index 15f520acd43a..f55ed999a82c 100644
--- a/share/zoneinfo/australasia
+++ b/share/zoneinfo/australasia
@@ -24,6 +24,9 @@ Rule	Aus	1943	only	-	Oct	 3	2:00	1:00	-
 Zone Australia/Darwin	 8:43:20 -	LMT	1895 Feb
 			 9:30	-	CST	1917 Jan 1 0:01
 			 9:30	Aus	CST
+
+# ZONE-DESCR Australia Darwin Australia Northern Territory
+
 Zone Australia/Perth	 7:43:24 -	LMT	1895 Dec
 			 8:00	-	WST	1917 Jan 1 0:01
 			 8:00	Aus	WST	1974 Oct lastSun 2:00
@@ -33,6 +36,9 @@ Zone Australia/Perth	 7:43:24 -	LMT	1895 Dec
 			 8:00	-	WST	1991 Nov 17 2:00
 			 8:00	1:00	WST	1992 Mar Sun>=1 3:00
 			 8:00	-	WST
+
+# ZONE-DESCR Australia Perth Australia Western_Australia
+
 Zone Australia/Brisbane	10:12:08 -	LMT	1895
 			10:00	-	EST	1917 Jan 1 0:01
 			10:00	Aus	EST	1971 Oct lastSun 2:00
@@ -45,6 +51,8 @@ Zone Australia/Brisbane	10:12:08 -	LMT	1895
 			10:00	1:00	EST	1992 Mar Sun>=1 3:00
 			10:00	-	EST
 
+# ZONE-DESCR Australia Brisbane Australia Queensland
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AS	1971	1985	-	Oct	lastSun	2:00	1:00	-
 Rule	AS	1986	only	-	Oct	19	2:00	1:00	-
@@ -61,6 +69,8 @@ Zone Australia/Adelaide	9:14:20 -	LMT	1895 Feb
 			9:30	Aus	CST	1971 Oct lastSun 2:00
 			9:30	AS	CST
 
+# ZONE-DESCR Australia Adelaide Australia South Australia
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AT	1967	only	-	Oct	1	2:00	1:00	-
 Rule	AT	1968	only	-	Mar	31	3:00	0	-
@@ -81,6 +91,8 @@ Zone Australia/Hobart	9:49:16	-	LMT	1895 Sep
 			10:00	Aus	EST	1967 Oct 1 2:00
 			10:00	AT	EST
 
+# ZONE-DESCR Australia Hobart Australia Tasmania
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AV	1971	1985	-	Oct	lastSun	2:00	1:00	-
 Rule	AV	1972	only	-	Feb	27	3:00	0	-
@@ -95,6 +107,8 @@ Zone Australia/Melbourne 9:39:52 -	LMT	1895 Feb
 			10:00	Aus	EST	1971 Oct 31 2:00
 			10:00	AV	EST
 
+# ZONE-DESCR Australia Melbourne Australia Victoria
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	AN	1971	1985	-	Oct	lastSun	2:00	1:00	-
 Rule	AN	1972	only	-	Feb	27	3:00	0	-
@@ -110,18 +124,29 @@ Zone Australia/Sydney	10:04:52 -	LMT	1895 Feb
 			10:00	-	EST	1917 Jan 1 0:01
 			10:00	Aus	EST	1971 Oct 31 2:00
 			10:00	AN	EST
+
+# ZONE-DESCR Australia Sydney Australia New South Wales
+
 Zone Australia/Broken_Hill 9:25:48 -	LMT	1895 Feb
 			10:00	-	EST	1896 Aug 23
 			9:00	-	CST	1899 May
 			9:30	-	CST	1917 Jan 1 0:01
 			9:30	Aus	CST	1971 Oct 31 2:00
 			9:30	AN	CST
+
+# ZONE-DESCR Australia Broken_Hill Australia County of Yancowinna, NSW
+
 Zone Australia/Lord_Howe 10:36:20 -	LMT	1895 Feb
 			10:00	-	EST	1981 Mar
 			10:30	AN	LHST
+
+# ZONE-DESCR Australia Lord_Howe Australia Lord Howe Island
+
 Zone Indian/Christmas	7:02:52 -	LMT	1895 Feb
 			7:00	-	JVT
 
+# ZONE-DESCR Indian Christmas Australia Christmas Island
+
 #
 # Ashmore Is, Cartier
 # no information; probably like Australia/Perth
@@ -134,6 +159,8 @@ Zone Indian/Christmas	7:02:52 -	LMT	1895 Feb
 Zone Pacific/Belau	8:58:00	-	LMT	1901
 			9:00	-	BLT
 
+# ZONE-DESCR Pacific Belau Rep_of_Palau All points
+
 # Cook Is
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cook	1978	only	-	Nov	12	0:00	0:30	HD
@@ -144,16 +171,22 @@ Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901		# Avarua
 			-10:30	-	CIST	1978 Nov 12	# Cook Is ST
 			-10:00	Cook	T%sT
 
+# ZONE-DESCR Pacific Rarotonga Cook_Island All points
+
 # Cocos
 # From USNO (1989):
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Cocos	6:30	-	CCT
 
+# ZONE-DESCR Pacific Cocos Cocos_Island All points
+
 # Fiji
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:53:40 -	LMT	1915 Oct 26	# Suva
 			12:00	-	NZST
 
+# ZONE-DESCR Pacific Fiji Fiji All points
+
 # French Polynesia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Gambier	 -8:59:48 -	LMT	1912 Oct	# Rikitea
@@ -163,11 +196,17 @@ Zone	Pacific/Marquesas -9:18:00 -	LMT	1912 Oct
 Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct	# Papeete
 			-10:00	-	THT
 
+# ZONE-DESCR Pacific Gambier France Gambier
+# ZONE-DESCR Pacific Marquesas France Marquesas
+# ZONE-DESCR Pacific Tahiti France Tahiti
+
 # Guam
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Guam	 9:39:00 -	LMT	1901		# Agana
 			10:00	-	GST
 
+# ZONE-DESCR Pacific Guam United_States Guam
+
 # Howland, Baker
 # no information; probably like Pacific/Samoa
 
@@ -188,6 +227,10 @@ Zone Pacific/Kiritimati	-10:29:20 -	LMT	1901
 			-10:40	-	LIT	1979 Oct	# Line Is Time
 			-10:00	-	THT
 
+# ZONE-DESCR Pacific Tarawa Kiribati Tarawa
+# ZONE-DESCR Pacific Enderbury Kiribati Enderbury
+# ZONE-DESCR Pacific Kiritimati Kiribati Kiritimati
+
 # Nauru
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15	# Uaobe
@@ -196,6 +239,8 @@ Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15	# Uaobe
 			11:30	-	NST	1979 May
 			12:00	-	NZST
 
+# ZONE-DESCR Pacific Nauru Nauru All points
+
 # New Caledonia
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	NC	1912	only	-	Jan	13	0:00	0	S
@@ -205,6 +250,7 @@ Rule	NC	1978	1979	-	Feb	27	0:00	0	S
 Zone	Pacific/Noumea	11:05:48 -	LMT	1912 Jan 13
 			11:00	NC	NC%sT
 
+# ZONE-DESCR Pacific Noumea New_Caledonia All points
 
 ###############################################################################
 
@@ -239,6 +285,9 @@ Zone Pacific/Auckland	11:39:04 -	LMT	1868
 Zone Pacific/Chatham	12:45	-	NZ-CHAT
 
 
+# ZONE-DESCR Pacific Auckland New_Zealand All points except:
+# ZONE-DESCR Pacific Chatham New_Zealand Chatham
+
 # Antipodes Is, Kermadec Is
 # no information; probably like Pacific/Auckland
 
@@ -252,12 +301,16 @@ Zone	Pacific/Niue	-11:19:40 -	LMT	1901		# Alofi
 			-11:30	-	NIT	1978 Oct 1
 			-11:00	-	SST
 
+# ZONE-DESCR Pacific Niue Niue All points
+
 # Norfolk
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Norfolk	11:11:52 -	LMT	1901		# Kingston
 			11:12	-	NMT	1951
 			11:30	-	NST
 
+# ZONE-DESCR Pacific Norfolk Norfolk_Islands All points
+
 # Pacific Islands Trust Territories
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Majuro	11:24:48 -	LMT	1901
@@ -276,6 +329,12 @@ Zone Pacific/Yap	9:12:24	-	LMT	1901
 			9:00	-	BLT	1969 Oct
 			10:00	-	GST
 
+# ZONE-DESCR Pacific Truk Fed_States_of_Micronesia Truk state
+# ZONE-DESCR Pacific Ponape Fed_States_of_Micronesia Pohnpei state
+# ZONE-DESCR Pacific Yap Fed_States_of_Micronesia Yap state
+# ZONE-DESCR Pacific Majuro Marshall_Islands Majuro
+# ZONE-DESCR Pacific Kwajalein Marshall_Islands Kwajalein
+
 # Palmyra
 # no information; probably like Pacific/Kiritmati
 
@@ -285,33 +344,46 @@ Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
 			9:49	-	PMMT	1895
 			10:00	-	EST
 
+# ZONE-DESCR Pacific Port_Moresby Papua_New_Guinea All points
+
 # Pitcairn
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Pitcairn	-8:40:20 -	LMT	1901		# Adamstown
 			-8:30	-	PIT
 
+# ZONE-DESCR Pacific Pitcairn Pitcairn_Island All points
+
 # Solomon Is
 # excludes Bougainville, for which see Papua New Guinea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct	# Honiara
 			11:00	-	NCST
 
+# ZONE-DESCR Pacific Guadalcanal Solomon_Islands All points except:
+# ZONE-DESCR Pacific Port_Moresby Solomon_Islands Bougainville
+
 # Tokelau Is
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fakaofo	-11:24:56 -	LMT	1901
 			-10:00	-	THT
 
+# ZONE-DESCR Pacific Fakaofo Tokelau_Island All points
+
 # Tonga
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Tongatapu	12:19:20 -	LMT	1901
 			12:20	-	TMT	1968 Oct
 			13:00	-	TGT
 
+# ZONE-DESCR Pacific Tongatapu Tonga All points
+
 # Tuvalu
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Funafuti	11:56:52 -	LMT	1901
 			12:00	-	NZST
 
+# ZONE-DESCR Pacific Funafuti Tuvalu All points
+
 # Vanuatu
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Vanuatu	1912	only	-	Jan	13	0:00	0	S
@@ -323,16 +395,22 @@ Rule	Vanuatu	1985	max	-	Sep	Sun>=23	0:00	1:00	D
 Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13		# Vila
 			11:00	-	NCST
 
+# ZONE-DESCR Pacific Efate Vanuatu All points
+
 # Wake
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Wake	11:06:28 -	LMT	1901
 			12:00	-	NZST
 
+# ZONE-DESCR Pacific Wake United_States Wake Island
+
 # Wallis and Futuna
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 			12:00	-	NZST
 
+# ZONE-DESCR Pacific Wallis France Wallis and Futuna
+
 # Western Samoa
 # See Pacific/Samoa in the `northamerica' file, of all places.
 
diff --git a/share/zoneinfo/northamerica b/share/zoneinfo/northamerica
index 9cd74b174c45..5be6e2d10e80 100644
--- a/share/zoneinfo/northamerica
+++ b/share/zoneinfo/northamerica
@@ -128,10 +128,17 @@ Zone America/Los_Angeles -8:00	US	P%sT
 Zone America/Anchorage	-9:00	US	AK%sT
 					# AK%sT is the abbreviation per USNO
 
+# ZONE-DESCR America New_York United_States Eastern time (except Indiana and Michigan)
+# ZONE-DESCR America Chicago United_States Central time
+# ZONE-DESCR America Denver United_States Mountain time (except Arizona)
+# ZONE-DESCR America Los_Angeles United_States Pacific time
+# ZONE-DESCR America Anchorage United_States Alaska time
+
 # Mainland US areas that are always Standard as of 1986.
 
 Zone America/Fort_Wayne -5:00	US	E%sT	1946
 			-5:00	-	EST	# Always EST as of 1986
+
 # From Arthur David Olson (October 28, 1991):
 # An article on page A3 of the Sunday, October 27, 1991 Washington Post
 # notes that Starke County switched from Central time to Eastern time as of
@@ -141,6 +148,11 @@ Zone America/Knox_IN	-6:00	US	C%sT	1991 Oct 27 2:00
 Zone America/Phoenix	-7:00	US	M%sT	1946
 			-7:00	-	MST	# Always MST as of 1986
 
+# ZONE-DESCR America Fort_Wayne United_States Indiana (except Starke County)
+# ZONE-DESCR America Knox_IN United_States Indiana (Starke County)
+# ZONE-DESCR America Phoenix United_States Arizona (except Navajo Nation)
+# ZONE-DESCR . Navajo United_States Arizona (Navajo Nation)
+
 # From Arthur David Olson (February 13, 1988):
 # However. . .a writer from the Inter Tribal Council of Arizona, Inc.,
 # notes in private correspondence dated 12/28/87 that "Presently, only the
@@ -157,6 +169,8 @@ Zone America/Detroit	-5:00	US	E%sT	1968
 			-5:00	-	EST	1973
 			-5:00	US	E%sT
 
+# ZONE-DESCR America Detroit United_States Michigan
+
 # Samoa just changes names.  No DST, per Naval Observatory.
 #
 # Howse writes that in 1879 the King of Samoa decided to change
@@ -192,6 +206,12 @@ Zone Pacific/Honolulu	-10:30	US	H%sT	1933 Apr 30 2:00
 			-10:30	US	H%sT	1947 Jun  8 2:00
 			-10:00	-	HST
 
+# ZONE-DESCR Pacific Samoa United_States American Samoa
+# ZONE-DESCR Pacific Samoa Western_Samoa All points
+# ZONE-DESCR Pacific Midway United_States Midway Island
+# ZONE-DESCR America Atka United_States Aleutian Islands
+# ZONE-DESCR Pacific Honolulu United_States Hawaii
+
 # Navassa
 # no information; probably like US/Eastern
 
@@ -342,6 +362,8 @@ Zone America/St_Johns	-3:30:52 -	LMT	1884
 			-3:31	StJohns	N%sT	1935 Mar 30
 			-3:30	StJohns	N%sT
 
+# ZONE-DESCR America St_Johns Canada Newfoundland
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Halifax	1902	only	-	Jun	15	0:00	0	S
 Rule Halifax	1916	only	-	Apr	 1	0:00	1:00	D
@@ -388,6 +410,8 @@ Rule Halifax	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 Zone America/Halifax	-4:14:24 -	LMT	1902 Jun 15
 			-4:00	Halifax	A%sT
 
+# ZONE-DESCR America Halifax Canada Atlantic time
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Mont	1884	only	-	Jan	 1	0:00	0	S
 Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
@@ -422,6 +446,8 @@ Rule	Mont	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 Zone America/Montreal	-4:54:16 -	LMT	1884
 			-5:00	Mont	E%sT
 
+# ZONE-DESCR America Montreal Canada Eastern time
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Winn	1887	only	-	Jul	16	0:00	0	S
 Rule	Winn	1916	only	-	Apr	23	0:00	1:00	D
@@ -449,6 +475,8 @@ Rule	Winn	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
 			-6:00	Winn	C%sT
 
+# ZONE-DESCR America Winnipeg Canada Manitoba
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Regina	1905	only	-	Sep	 1	0:00	0	S
 Rule	Regina	1918	only	-	Apr	14	2:00	1:00	D
@@ -470,6 +498,8 @@ Zone	America/Regina	-6:58:36 -	LMT	1905 Sep
 			-7:00	Regina	M%sT	1966 Apr 15
 			-6:00	-	CST
 
+# ZONE-DESCR America Regina Canada Saskatchewan
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Edm	1906	only	-	Sep	 1	0:00	0	S
 Rule	Edm	1918	1919	-	Apr	Sun>=8	2:00	1:00	D
@@ -493,6 +523,8 @@ Rule	Edm	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 Zone America/Edmonton	-7:33:52 -	LMT	1906 Sep
 			-7:00	Edm	M%sT
 
+# ZONE-DESCR America Edmonton Canada Alberta
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Vanc	1884	only	-	Jan	 1	0:00	0	S
 Rule	Vanc	1918	only	-	Apr	14	2:00	1:00	D
@@ -508,6 +540,8 @@ Rule	Vanc	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 Zone America/Vancouver	-8:12:28 -	LMT	1884
 			-8:00	Vanc	P%sT
 
+# ZONE-DESCR America Vancouver Canada British Columbia
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Yukon	1900	only	-	Jan	 1	0:00	0	S
 Rule	Yukon	1918	only	-	Apr	14	2:00	1:00	D
@@ -526,6 +560,8 @@ Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
 			-8:00	Yukon	P%sT
 # Parts of Yukon (e.g. Dawson) didn't switch to -8:00 until 1973 Oct 28.
 
+# ZONE-DESCR America Whitehorse Canada Yukon Territory
+
 ###############################################################################
 
 # Mexico
@@ -603,6 +639,7 @@ Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  0:23:24
 			-6:00	-	CST	1931 Oct
 			-7:00	-	MST	1932 Mar 30 23:00
 			-6:00	Mexico	C%sT
+# ZONE-DESCR America Mexico_City Mexico Mexico City
 Zone America/Mazatlan	-7:05:40 -	LMT	1921 Dec 31 23:54:20
 			-7:00	-	MST	1927 Jun 10 23:00
 			-6:00	-	CST	1930 Nov 15
@@ -613,6 +650,7 @@ Zone America/Mazatlan	-7:05:40 -	LMT	1921 Dec 31 23:54:20
 			-7:00	-	MST	1949 Jan 14
 			-8:00	-	PST	1970
 			-7:00	-	MST
+# ZONE-DESCR America Mazatlan Mexico Mazatlan
 Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
 			-8:00	-	PST	1927 Jun 10 23:00
 			-7:00	-	MST	1930 Nov 16
@@ -620,12 +658,15 @@ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
 			-7:00	-	MST	1949 Jan 14
 			-8:00	BajaN	P%sT	1967 Apr lastSun 2:00
 			-8:00	US	P%sT
+# ZONE-DESCR America Tijuana Mexico Baja California Norte
 Zone America/Ensenada	-7:46:28 -	LMT	1922 Jan  1  0:13:32
 			-8:00	-	PST	1927 Jun 10 23:00
 			-7:00	-	MST	1930 Nov 16
 			-8:00	-	PST	1942 Apr
 			-7:00	-	MST	1949 Jan 14
 			-8:00	-	PST
+# ZONE-DESCR America Ensenada Mexico Ensenada
+
 #
 # Revillagigedo Is
 # no information
@@ -637,12 +678,16 @@ Zone America/Ensenada	-7:46:28 -	LMT	1922 Jan  1  0:13:32
 Zone America/Anguilla	-4:12:16 -	LMT	1912 Mar 2
 			-4:00	-	AST
 
+# ZONE-DESCR America Anguilla Anguilla All points
+
 # Antigua and Barbuda
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
 			-5:00	-	EST	1951
 			-4:00	-	AST
 
+# ZONE-DESCR America Antigua Antigua All points
+
 # Bahamas
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Bahamas	1912	only	-	Mar	2	0:00	0	S
@@ -653,6 +698,8 @@ Rule	Bahamas	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 Zone	America/Nassau	-5:09:24 -	LMT	1912 Mar 2
 			-5:00	Bahamas	E%sT
 
+# ZONE-DESCR America Nassau Bahamas All points
+
 # Barbados
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Barb	1932	only	-	Jan	1	0:00	0	S
@@ -666,6 +713,8 @@ Zone America/Barbados	-3:58:28 -	LMT	1924		# Bridgetown
 			-3:58	-	BMT	1932	  # Bridgetown Mean Time
 			-4:00	Barb	A%sT
 
+# ZONE-DESCR America Barbados Barbados All points
+
 # Belize
 # Whitman entirely disagrees with Shanks; go with Shanks.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -680,18 +729,24 @@ Rule	Belize	1983	only	-	Feb	12	0:00	0	S
 Zone	America/Belize	-5:52:48 -	LMT	1912 Apr
 			-6:00	Belize	C%sT
 
+# ZONE-DESCR America Belize Belize All points
+
 # Bermuda
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Bermuda	-4:19:04 -	LMT	1930 Jan  1 2:00    # Hamilton
 			-4:00	-	AST	1974 Apr 28 2:00
 			-4:00	Bahamas	A%sT
 
+# ZONE-DESCR Atlantic Bermuda Bermuda All points
+
 # Cayman Is
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Cayman	-5:25:32 -	LMT	1890		# Georgetown
 			-5:07	-	KMT	1912 Feb    # Kingston Mean Time
 			-5:00	-	EST
 
+# ZONE-DESCR America Cayman Cayman_Islands All points
+
 # Clipperton
 # no information
 
@@ -709,6 +764,8 @@ Rule	CR	1991	only	-	Jul	1	0:00	0	S
 Zone America/Costa_Rica	-5:36:20 -	LMT	1890		# San Jose
 			-5:36	-	SJMT	1921 Jan 15 # San Jose Mean Time
 			-6:00	CR	C%sT
+# ZONE-DESCR America Costa_Rica Costa_Rica All points
+
 # Coco
 # no information; probably like America/Costa_Rica
 
@@ -757,11 +814,15 @@ Zone	America/Havana	-5:29:28 -	LMT	1890
 			-5:30	-	HMT	1925 Jul 19 12:00 # Havana MT
 			-5:00	Cuba	C%sT
 
+# ZONE-DESCR America Havana Cuba All points
+
 # Dominica
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Dominica	-4:05:36 -	LMT	1911 Jul 1 0:01		# Roseau
 			-4:00	-	AST
 
+# ZONE-DESCR America Dominica Dominica All points
+
 # Dominican Republic
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	DR	1933	only	-	Apr	1	12:00	0	S
@@ -777,6 +838,8 @@ Zone America/Santo_Domingo -4:39:36 -	LMT	1890
 			-5:00	DR	E%sT	1974 Oct 27
 			-4:00	-	AST
 
+# ZONE-DESCR America Santo_Domingo Dominican_Republic All points
+
 # El Salvador
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Salv	1921	only	-	Jan	1	0:00	0	S
@@ -787,16 +850,22 @@ Rule	Salv	1987	1988	-	Sep	lastSun	0:00	0	S
 Zone America/El_Salvador -5:56:48 -	LMT	1921		# San Salvador
 			-6:00	Salv	C%sT
 
+# ZONE-DESCR America El_Salvador El_Salvador All points
+
 # Grenada
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Grenada	-4:07:00 -	LMT	1911 Jul
 			-4:00	-	AST
 
+# ZONE-DESCR America Grenada Grenada All points
+
 # Guadeloupe
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun 8	# Pointe a Pitre
 			-4:00	-	AST
 
+# ZONE-DESCR America Guadeloupe Guadeloupe All points
+
 # Guatemala
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Guat	1918	only	-	Oct	5	0:00	0	S
@@ -808,6 +877,8 @@ Rule	Guat	1983	only	-	Sep	22	0:00	0	S
 Zone America/Guatemala	-6:02:04 -	LMT	1918 Oct 5
 			-6:00	Guat	C%sT
 
+# ZONE-DESCR America Guatemala Guatemala All points
+
 # Haiti
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Haiti	1917	only	-	Jan	24	12:00	0	S
@@ -821,12 +892,16 @@ Zone America/Port-au-Prince -4:49:20 -	LMT	1890
 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
 			-5:00	Haiti	E%sT
 
+# ZONE-DESCR America Port-au-Prince Haiti All points
+
 # Honduras
 # Shanks says 1921 Jan 1; go with Whitman's more precise Apr 1.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Tegucigalpa -5:48:52 -	LMT	1921 Apr
 			-6:00	Salv	C%sT
 
+# ZONE-DESCR America Tegucigalpa Honduras All points
+
 # Jamaica
 
 # From Bob Devine (January 28, 1988):
@@ -842,6 +917,8 @@ Zone	America/Jamaica	-5:07:12 -	LMT	1890		# Kingston
 			-5:00	-	EST	1974 Jan 6 2:00
 			-5:00	US	E%sT
 
+# ZONE-DESCR America Jamaica Jamaica All points
+
 # Martinique
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Martinique	-4:04:20 -      LMT	1890		# Fort-de-France
@@ -850,11 +927,15 @@ Zone America/Martinique	-4:04:20 -      LMT	1890		# Fort-de-France
 			-4:00	1:00	ADT	1980 Sep 28
 			-4:00	-	AST
 
+# ZONE-DESCR America Martinique Martinique All points
+
 # Montserrat
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul 1 0:01   # Plymouth
 			-4:00	-	AST
 
+# ZONE-DESCR America Montserrat Montserrat All points
+
 # Nicaragua
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Nic	1975	only	-	Feb	16	0:00	0	S
@@ -867,12 +948,16 @@ Zone	America/Managua	-5:45:08 -	LMT	1890
 			-5:00	-	EST	1975 Feb 16
 			-6:00	Nic	C%sT
 
+# ZONE-DESCR America Managua Nicaragua All points
+
 # Panama
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Panama	-5:18:08 -	LMT	1890
 			-5:20	-	PMT	1908 Apr 22   # Panama Mean Time
 			-5:00	-	EST
 
+# ZONE-DESCR America Panama Panama All points
+
 # Puerto Rico
 # There are too many San Juans elsewhere, so we'll use `Puerto_Rico'.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -881,17 +966,23 @@ Zone America/Puerto_Rico -4:24:28 -	LMT	1899 Mar 28 12:00    # San Juan
 			-4:00	1:00	ADT	1945 Sep 30  2:00
 			-4:00	-	AST
 
+# ZONE-DESCR America Puerto_Rico United_States Puerto Rico
+
 # St Kitts-Nevis
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/St_Kitts	-4:10:52 -	LMT	1912 Mar 2	# Basseterre
 			-4:00	-	AST
 
+# ZONE-DESCR America St_Kitts St_Kitts_and_Nevis All points 
+
 # St Lucia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/St_Lucia	-4:04:00 -	LMT	1890		# Castries
 			-4:04	-	CMT	1912	    # Castries Mean Time
 			-4:00	-	AST
 
+# ZONE-DESCR America St_Lucia St_Lucia All points
+
 # St Pierre and Miquelon
 # There are too many St Pierres elsewhere, so we'll use `Miquelon'.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -899,12 +990,16 @@ Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15	# St Pierre
 			-4:00	-	AST	1980 May
 			-3:00	Mont	SP%sT
 
+# ZONE-DESCR America Miquelon France St. Pierre and Miquelon
+
 # St Vincent and the Grenadines
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/St_Vincent	-4:04:56 -	LMT	1890		# Kingstown
 			-4:05	-	KMT	1912	   # Kingstown Mean Time
 			-4:00	-	AST
 
+# ZONE-DESCR America St_Vincent St_Vincent All points
+
 # Turks and Caicos
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Grand_Turk	-4:44:32 -	LMT	1890
@@ -912,7 +1007,12 @@ Zone America/Grand_Turk	-4:44:32 -	LMT	1890
 			-5:00	-	EST	1979 Apr 29 2:00
 			-5:00	US	E%sT
 
+# ZONE-DESCR America Grand_Turk Turks_and_Caicos All points
+
 # Virgin Is (British and US)
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Virgin	-4:19:44 -	LMT	1911 Jul    # Charlotte Amalie
 			-4:00	-	AST
+
+# ZONE-DESCR America Virgin United_States US Virgin Islands
+# ZONE-DESCR America virgin United_Kingdom British Virgin Islands
diff --git a/share/zoneinfo/southamerica b/share/zoneinfo/southamerica
index b40ce559a35d..e93505bcddef 100644
--- a/share/zoneinfo/southamerica
+++ b/share/zoneinfo/southamerica
@@ -93,6 +93,8 @@ Zone America/Buenos_Aires -3:53:48 -	LMT	1894 Nov
 			-4:00	Arg	A%sT	1969 Oct 5
 			-3:00	Arg	E%sT
 
+# ZONE-DESCR America Buenos_Aires Argentina All points
+
 # Bolivia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/La_Paz	-4:32:36 -	LMT	1890
@@ -100,6 +102,8 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 			-4:33	1:00	LPDT	1932 Mar 21
 			-4:00	-	AST
 
+# ZONE-DESCR America La_Paz Bolivia All points
+
 # Brazil
 
 # From Guy Harris:
@@ -182,6 +186,10 @@ Zone America/Porto_Acre	-4:31:12 -	LMT	1914
 #
 # Martin Vaz and Trinidade are like America/Noronha.
 
+# ZONE-DESCR America Noronha Brazil Fernando De Noronha
+# ZONE-DESCR America Sao_Paulo Brazil Eastern zone
+# ZONE-DESCR America Manaus Brazil Western zone
+# ZONE-DESCR America Porto_Acre Brazil Territory of Acre
 
 # Chile
 
@@ -214,6 +222,8 @@ Zone Pacific/Easter	-7:17:28 -	LMT	1890	    # Mataveri
 # San Ambrosio, San Felix
 # no information; probably like America/Santiago
 
+# ZONE-DESCR America Santiago Chile All points
+# ZONE-DESCR Pacific Easter Easter_Island All points
 
 # Colombia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -223,12 +233,16 @@ Zone	America/Bogota	-4:56:20 -	LMT	1884 Mar 13
 # Malpelo, Providencia, San Andres
 # no information; probably like America/Bogota
 
+# ZONE-DESCR America Botoga Colombia All points
+
 # Curacao
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Curacao	-4:35:44 -	LMT	1912 Feb 12	# Willemstad
 			-4:30	-	NAST	1965	# Netherlands Antilles
 			-4:00	-	AST
 
+# ZONE-DESCR America Curacao Curacao All points
+
 # Ecuador
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Guayaquil	-5:19:20 -	LMT	1890
@@ -238,6 +252,9 @@ Zone Pacific/Galapagos	-5:58:24 -	LMT	1931 # Puerto Baquerizo Moreno
 			-5:00	-	EST	1986
 			-6:00	-	CST
 
+# ZONE-DESCR America Guayaquil Ecuador All points except:
+# ZONE-DESCR Pacific Galapagos Ecuador Galapagos Islands
+
 # Falklands
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Falk	1912	only	-	Mar	12	0:00	0	S
@@ -258,18 +275,23 @@ Zone Atlantic/Stanley	-3:51:24 -	LMT	1890
 			-3:00	Falk	E%sT	1985 Sep 15
 			-4:00	Falk	A%sT
 
+# ZONE-DESCR Atlantic Stanley Falkland_Islands All points
+
 # French Guiana
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Cayenne	-3:29:20 -	LMT	1911 Jul
 			-4:00	-	AST	1967 Oct
 			-3:00	-	EST
 
+# ZONE-DESCR America Cayenne French_Guiana All points
+
 # Guyana
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar	# Georgetown
 			-3:45	-	BGST	1975 Jul 31  # British Guiana ST
 			-3:00	-	EST
 
+# ZONE-DESCR America Guyana Guyana All points
 
 # Paraguay
 
@@ -298,6 +320,8 @@ Zone America/Asuncion	-3:50:40 -	LMT	1890
 			-3:00	-	EST	1974 Apr
 			-4:00	Para	A%sT
 
+# ZONE-DESCR America Asuncion Paraguay All points
+
 # Peru
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Peru	1908	only	-	Jul	28	0:00	0	S
@@ -314,11 +338,15 @@ Zone	America/Lima	-5:08:12 -	LMT	1890
 			-5:09	-	LMT	1908 Jul 28
 			-5:00	Peru	E%sT
 
+# ZONE-DESCR America Lima Peru All points
+
 # South Georgia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890		# Grytviken
 			-2:00	-	FST
 
+# ZONE-DESCR Atlantic South_Georgia South_Georgia All points
+
 # South Sandwich Is
 # no information
 
@@ -330,11 +358,15 @@ Zone America/Paramaribo	-3:40:40 -	LMT	1911
 			-3:30	-	DGST	1984 Oct # Dutch Guiana Std Time
 			-3:00	-	EST
 
+# ZONE-DESCR America Paramaibo Suriname All points
+
 # Trinidad and Tobago
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Port_of_Spain -4:06:04 -	LMT	1912 Mar 2
 			-4:00	-	AST
 
+# ZONE-DESCR America Port_of_Spain Trinidad_and_Tobago All points
+
 # Uruguay
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
 # Uruguay wins the prize for the strangest peacetime manipulation of the rules.
@@ -389,9 +421,13 @@ Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
 			-3:30	Uruguay	U%sT	1942 Dec 14	# Uruguay ST
 			-3:00	Uruguay	E%sT
 
+# ZONE-DESCR America Montevideo Uruguay All points
+
 # Venezuela
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Caracas	-4:27:44 -	LMT	1890
 			-4:28	-	CMT	1912 Feb 12  # Caracas Mean Time
 			-4:30	-	VZT	1965		# Venezuela Time
 			-4:00	-	AST
+
+# ZONE-DESCR America Caracas Venezuela All points