From 2a18a625a0171e5c54249a54179eda3409b1b838 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 6 May 2021 13:31:25 -0700
Subject: [PROPOSED 2/3] Move several compatibilty links to 'backward'

Move backward-compatibility links that are not present in the
zone1970.tab to the 'backward' file.  I put these entries in long
ago only because of the now-abandoned guideline that every ISO
3166 code should have a zone.
* NEWS: Mention this.
* africa, asia, australasia, backward, europe:
* northamerica, southamerica:
(Africa/Addis_Ababa, Africa/Asmara, Africa/Bamako)
(Africa/Bangui, Africa/Banjul, Africa/Blantyre)
(Africa/Brazzaville, Africa/Bujumbura, Africa/Conakry)
(Africa/Dakar, Africa/Dar_es_Salaam, Africa/Djibouti)
(Africa/Douala, Africa/Freetown, Africa/Gaborone, Africa/Harare)
(Africa/Kampala, Africa/Kigali, Africa/Kinshasa)
(Africa/Libreville, Africa/Lome, Africa/Luanda, Africa/Lubumbashi)
(Africa/Lusaka, Africa/Malabo, Africa/Maseru, Africa/Mbabane)
(Africa/Mogadishu, Africa/Niamey, Africa/Nouakchott)
(Africa/Ouagadougou, Africa/Porto-Novo, America/Anguilla)
(America/Antigua, America/Aruba, America/Cayman, America/Dominica)
(America/Grenada, America/Guadeloupe, America/Kralendijk)
(America/Lower_Princes, America/Marigot, America/Montserrat)
(America/St_Barthelemy, America/St_Kitts, America/St_Lucia)
(America/St_Thomas, America/St_Vincent, America/Tortola)
(Antarctica/McMurdo, Arctic/Longyearbyen, Asia/Aden, Asia/Bahrain)
(Asia/Istanbul, Asia/Kuwait, Asia/Muscat, Asia/Phnom_Penh)
(Asia/Vientiane, Atlantic/St_Helena, Europe/Bratislava)
(Europe/Busingen, Europe/Guernsey, Europe/Isle_of_Man)
(Europe/Jersey, Europe/Ljubljana, Europe/Mariehamn)
(Europe/Nicosia, Europe/Podgorica, Europe/San_Marino)
(Europe/Sarajevo, Europe/Skopje, Europe/Vaduz, Europe/Vatican)
(Europe/Zagreb, Indian/Antananarivo, Indian/Comoro)
(Indian/Mayotte, Pacific/Midway, Pacific/Saipan):
Move these backward-compatibility links here from the other files.
---
 NEWS         |  5 ++++
 africa       | 38 +------------------------
 asia         |  9 +-----
 australasia  |  4 ---
 backward     | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 europe       | 25 ++++-------------
 northamerica |  9 ++++--
 southamerica | 21 ++------------
 8 files changed, 102 insertions(+), 88 deletions(-)

diff --git a/NEWS b/NEWS
index 298ddac..218952e 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,11 @@ Unreleased, experimental changes
 
     The new file SECURITY covers how to report security-related bugs.
 
+    Several backward-compatibility links have been moved to the
+    'backward' file.  These links, which range from Africa/Addis_Ababa
+    to Pacific/Saipan, are only for compatibility with now-obsolete
+    guidelines suggesting an entry for every ISO 3166 code.
+
   Changes to code
 
     zic now creates each output file or link atomically,
diff --git a/africa b/africa
index ffe4a9d..a867cc4 100644
--- a/africa
+++ b/africa
@@ -150,15 +150,6 @@ Zone	Africa/Ndjamena	1:00:12 -	LMT	1912        # N'Djamena
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
 			 0:00	-	GMT
-Link Africa/Abidjan Africa/Bamako	# Mali
-Link Africa/Abidjan Africa/Banjul	# Gambia
-Link Africa/Abidjan Africa/Conakry	# Guinea
-Link Africa/Abidjan Africa/Dakar	# Senegal
-Link Africa/Abidjan Africa/Freetown	# Sierra Leone
-Link Africa/Abidjan Africa/Lome		# Togo
-Link Africa/Abidjan Africa/Nouakchott	# Mauritania
-Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
-Link Africa/Abidjan Atlantic/St_Helena	# St Helena
 
 # Djibouti
 # See Africa/Nairobi.
@@ -378,7 +369,7 @@ Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
 # Gabon
 # See Africa/Lagos.
 
-# Gambia
+# The Gambia
 # See Africa/Abidjan.
 
 # Ghana
@@ -530,15 +521,6 @@ Zone	Africa/Nairobi	2:27:16	-	LMT	1908 May
 			2:30	-	+0230	1936 Dec 31 24:00
 			2:45	-	+0245	1942 Jul 31 24:00
 			3:00	-	EAT
-Link Africa/Nairobi Africa/Addis_Ababa	 # Ethiopia
-Link Africa/Nairobi Africa/Asmara	 # Eritrea
-Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania
-Link Africa/Nairobi Africa/Djibouti
-Link Africa/Nairobi Africa/Kampala	 # Uganda
-Link Africa/Nairobi Africa/Mogadishu	 # Somalia
-Link Africa/Nairobi Indian/Antananarivo	 # Madagascar
-Link Africa/Nairobi Indian/Comoro
-Link Africa/Nairobi Indian/Mayotte
 
 # Lesotho
 # See Africa/Johannesburg.
@@ -1225,13 +1207,6 @@ Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Maputo	2:10:20 -	LMT	1903 Mar
 			2:00	-	CAT
-Link Africa/Maputo Africa/Blantyre	# Malawi
-Link Africa/Maputo Africa/Bujumbura	# Burundi
-Link Africa/Maputo Africa/Gaborone	# Botswana
-Link Africa/Maputo Africa/Harare	# Zimbabwe
-Link Africa/Maputo Africa/Kigali	# Rwanda
-Link Africa/Maputo Africa/Lubumbashi	# E Dem. Rep. of Congo
-Link Africa/Maputo Africa/Lusaka	# Zambia
 
 
 # Namibia
@@ -1379,15 +1354,6 @@ Zone	Africa/Lagos	0:13:35 -	LMT	1905 Jul  1
 			0:13:35	-	LMT	1914 Jan  1
 			0:30	-	+0030	1919 Sep  1
 			1:00	-	WAT
-Link Africa/Lagos Africa/Bangui	     # Central African Republic
-Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo
-Link Africa/Lagos Africa/Douala	     # Cameroon
-Link Africa/Lagos Africa/Kinshasa    # Dem. Rep. of the Congo (west)
-Link Africa/Lagos Africa/Libreville  # Gabon
-Link Africa/Lagos Africa/Luanda	     # Angola
-Link Africa/Lagos Africa/Malabo	     # Equatorial Guinea
-Link Africa/Lagos Africa/Niamey	     # Niger
-Link Africa/Lagos Africa/Porto-Novo  # Benin
 
 # Réunion
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
@@ -1487,8 +1453,6 @@ Rule	SA	1943	1944	-	Mar	Sun>=15	2:00	0	-
 Zone Africa/Johannesburg 1:52:00 -	LMT	1892 Feb 8
 			1:30	-	SAST	1903 Mar
 			2:00	SA	SAST
-Link Africa/Johannesburg Africa/Maseru	   # Lesotho
-Link Africa/Johannesburg Africa/Mbabane    # Eswatini
 #
 # Marion and Prince Edward Is
 # scientific station since 1947
diff --git a/asia b/asia
index ac7def8..a2f6e02 100644
--- a/asia
+++ b/asia
@@ -1173,10 +1173,9 @@ Zone	Asia/Famagusta	2:15:48	-	LMT	1921 Nov 14
 			2:00	EUAsia	EE%sT	2016 Sep  8
 			3:00	-	+03	2017 Oct 29 1:00u
 			2:00	EUAsia	EE%sT
-
 # Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
 # However, for various reasons many users expect to find it under Europe.
-Link	Asia/Nicosia	Europe/Nicosia
+# See the 'backward' file for the Europe/Nicosia link.
 
 # Georgia
 # From Paul Eggert (1994-11-19):
@@ -3516,7 +3515,6 @@ Zone	Asia/Manila	-15:56:00 -	LMT	1844 Dec 31
 Zone	Asia/Qatar	3:26:08 -	LMT	1920     # Al Dawhah / Doha
 			4:00	-	+04	1972 Jun
 			3:00	-	+03
-Link Asia/Qatar Asia/Bahrain
 
 # Saudi Arabia
 #
@@ -3563,8 +3561,6 @@ Link Asia/Qatar Asia/Bahrain
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Riyadh	3:06:52 -	LMT	1947 Mar 14
 			3:00	-	+03
-Link Asia/Riyadh Asia/Aden	# Yemen
-Link Asia/Riyadh Asia/Kuwait
 
 # Singapore
 # taken from Mok Ly Yng (2003-10-30)
@@ -3821,8 +3817,6 @@ Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
 Zone	Asia/Bangkok	6:42:04	-	LMT	1880
 			6:42:04	-	BMT	1920 Apr # Bangkok Mean Time
 			7:00	-	+07
-Link Asia/Bangkok Asia/Phnom_Penh	# Cambodia
-Link Asia/Bangkok Asia/Vientiane	# Laos
 
 # Turkmenistan
 # From Shanks & Pottenger.
@@ -3837,7 +3831,6 @@ Zone	Asia/Ashgabat	3:53:32 -	LMT	1924 May  2 # or Ashkhabad
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dubai	3:41:12 -	LMT	1920
 			4:00	-	+04
-Link Asia/Dubai Asia/Muscat	# Oman
 
 # Uzbekistan
 # Byalokoz 1919 says Uzbekistan was 4:27:53.
diff --git a/australasia b/australasia
index 291819e..18dfd93 100644
--- a/australasia
+++ b/australasia
@@ -458,7 +458,6 @@ Zone	Pacific/Guam	-14:21:00 -	LMT	1844 Dec 31
 			 9:00	-	+09	1944 Jul 31
 			10:00	Guam	G%sT	2000 Dec 23
 			10:00	-	ChST	# Chamorro Standard Time
-Link Pacific/Guam Pacific/Saipan # N Mariana Is
 
 # Kiribati
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
@@ -584,8 +583,6 @@ Zone Pacific/Chatham	12:13:48 -	LMT	1868 Nov  2
 			12:15	-	+1215	1946 Jan  1
 			12:45	Chatham	+1245/+1345
 
-Link Pacific/Auckland Antarctica/McMurdo
-
 # Auckland Is
 # uninhabited; Māori and Moriori, colonial settlers, pastoralists, sealers,
 # and scientific personnel have wintered
@@ -706,7 +703,6 @@ Zone Pacific/Pitcairn	-8:40:20 -	LMT	1901        # Adamstown
 Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1892 Jul  5
 			-11:22:48 -	LMT	1911
 			-11:00	-	SST	            # S=Samoa
-Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
 
 # Samoa (formerly and also known as Western Samoa)
 
diff --git a/backward b/backward
index 0c55be2..9b5e6d0 100644
--- a/backward
+++ b/backward
@@ -7,46 +7,105 @@
 # and their old names.  Many names changed in late 1993.
 
 # Link	TARGET			LINK-NAME
+Link	Africa/Nairobi		Africa/Addis_Ababa
+Link	Africa/Nairobi		Africa/Asmara
 Link	Africa/Nairobi		Africa/Asmera
+Link	Africa/Abidjan		Africa/Bamako
+Link	Africa/Lagos		Africa/Bangui
+Link	Africa/Abidjan		Africa/Banjul
+Link	Africa/Maputo		Africa/Blantyre
+Link	Africa/Lagos		Africa/Brazzaville
+Link	Africa/Maputo		Africa/Bujumbura
+Link	Africa/Abidjan		Africa/Conakry
+Link	Africa/Abidjan		Africa/Dakar
+Link	Africa/Nairobi		Africa/Dar_es_Salaam
+Link	Africa/Nairobi		Africa/Djibouti
+Link	Africa/Lagos		Africa/Douala
+Link	Africa/Abidjan		Africa/Freetown
+Link	Africa/Maputo		Africa/Gaborone
+Link	Africa/Maputo		Africa/Harare
+Link	Africa/Nairobi		Africa/Kampala
+Link	Africa/Maputo		Africa/Kigali
+Link	Africa/Lagos		Africa/Kinshasa
+Link	Africa/Lagos		Africa/Libreville
+Link	Africa/Abidjan		Africa/Lome
+Link	Africa/Lagos		Africa/Luanda
+Link	Africa/Maputo		Africa/Lubumbashi
+Link	Africa/Maputo		Africa/Lusaka
+Link	Africa/Lagos		Africa/Malabo
+Link	Africa/Johannesburg	Africa/Maseru
+Link	Africa/Johannesburg	Africa/Mbabane
+Link	Africa/Nairobi		Africa/Mogadishu
+Link	Africa/Lagos		Africa/Niamey
+Link	Africa/Abidjan		Africa/Nouakchott
+Link	Africa/Abidjan		Africa/Ouagadougou
+Link	Africa/Lagos		Africa/Porto-Novo
 Link	Africa/Abidjan		Africa/Timbuktu
+Link	America/Port_of_Spain	America/Anguilla
+Link	America/Port_of_Spain	America/Antigua
 Link	America/Argentina/Catamarca	America/Argentina/ComodRivadavia
+Link	America/Curacao		America/Aruba
 Link	America/Adak		America/Atka
 Link	America/Argentina/Buenos_Aires	America/Buenos_Aires
 Link	America/Argentina/Catamarca	America/Catamarca
+Link	America/Panama		America/Cayman
 Link	America/Atikokan	America/Coral_Harbour
 Link	America/Argentina/Cordoba	America/Cordoba
+Link	America/Port_of_Spain	America/Dominica
 Link	America/Tijuana		America/Ensenada
 Link	America/Indiana/Indianapolis	America/Fort_Wayne
 Link	America/Nuuk		America/Godthab
+Link	America/Port_of_Spain	America/Grenada
+Link	America/Port_of_Spain	America/Guadeloupe
 Link	America/Indiana/Indianapolis	America/Indianapolis
 Link	America/Argentina/Jujuy	America/Jujuy
 Link	America/Indiana/Knox	America/Knox_IN
+Link	America/Curacao		America/Kralendijk
 Link	America/Kentucky/Louisville	America/Louisville
+Link	America/Curacao		America/Lower_Princes
+Link	America/Port_of_Spain	America/Marigot
 Link	America/Argentina/Mendoza	America/Mendoza
 Link	America/Toronto		America/Montreal
+Link	America/Port_of_Spain	America/Montserrat
 Link	America/Rio_Branco	America/Porto_Acre
 Link	America/Argentina/Cordoba	America/Rosario
 Link	America/Tijuana		America/Santa_Isabel
 Link	America/Denver		America/Shiprock
+Link	America/Port_of_Spain	America/St_Barthelemy
+Link	America/Port_of_Spain	America/St_Kitts
+Link	America/Port_of_Spain	America/St_Lucia
+Link	America/Port_of_Spain	America/St_Thomas
+Link	America/Port_of_Spain	America/St_Vincent
+Link	America/Port_of_Spain	America/Tortola
 Link	America/Port_of_Spain	America/Virgin
+Link	Pacific/Auckland	Antarctica/McMurdo
 Link	Pacific/Auckland	Antarctica/South_Pole
+Link	Europe/Oslo		Arctic/Longyearbyen
+Link	Asia/Riyadh		Asia/Aden
 Link	Asia/Ashgabat		Asia/Ashkhabad
+Link	Asia/Qatar		Asia/Bahrain
 Link	Asia/Kolkata		Asia/Calcutta
 Link	Asia/Shanghai		Asia/Chongqing
 Link	Asia/Shanghai		Asia/Chungking
 Link	Asia/Dhaka		Asia/Dacca
 Link	Asia/Shanghai		Asia/Harbin
+Link	Europe/Istanbul		Asia/Istanbul
 Link	Asia/Urumqi		Asia/Kashgar
 Link	Asia/Kathmandu		Asia/Katmandu
+Link	Asia/Riyadh		Asia/Kuwait
 Link	Asia/Macau		Asia/Macao
+Link	Asia/Dubai		Asia/Muscat
+Link	Asia/Bangkok		Asia/Phnom_Penh
 Link	Asia/Yangon		Asia/Rangoon
 Link	Asia/Ho_Chi_Minh	Asia/Saigon
 Link	Asia/Jerusalem		Asia/Tel_Aviv
 Link	Asia/Thimphu		Asia/Thimbu
 Link	Asia/Makassar		Asia/Ujung_Pandang
 Link	Asia/Ulaanbaatar	Asia/Ulan_Bator
+Link	Asia/Bangkok		Asia/Vientiane
 Link	Atlantic/Faroe		Atlantic/Faeroe
 Link	Europe/Oslo		Atlantic/Jan_Mayen
+Link	Africa/Abidjan		Atlantic/St_Helena
 Link	Australia/Sydney	Australia/ACT
 Link	Australia/Sydney	Australia/Canberra
 Link	Australia/Hobart	Australia/Currie
@@ -81,7 +140,22 @@ Link	Africa/Cairo		Egypt
 Link	Europe/Dublin		Eire
 Link	Etc/UTC			Etc/UCT
 Link	Europe/London		Europe/Belfast
+Link	Europe/Prague		Europe/Bratislava
+Link	Europe/Zurich		Europe/Busingen
+Link	Europe/London		Europe/Guernsey
+Link	Europe/London		Europe/Isle_of_Man
+Link	Europe/London		Europe/Jersey
+Link	Europe/Belgrade		Europe/Ljubljana
+Link	Europe/Helsinki		Europe/Mariehamn
+Link	Asia/Nicosia		Europe/Nicosia
+Link	Europe/Belgrade		Europe/Podgorica
+Link	Europe/Rome		Europe/San_Marino
+Link	Europe/Belgrade		Europe/Sarajevo
+Link	Europe/Belgrade		Europe/Skopje
 Link	Europe/Chisinau		Europe/Tiraspol
+Link	Europe/Zurich		Europe/Vaduz
+Link	Europe/Rome		Europe/Vatican
+Link	Europe/Belgrade		Europe/Zagreb
 Link	Europe/London		GB
 Link	Europe/London		GB-Eire
 Link	Etc/GMT			GMT+0
@@ -90,6 +164,9 @@ Link	Etc/GMT			GMT0
 Link	Etc/GMT			Greenwich
 Link	Asia/Hong_Kong		Hongkong
 Link	Atlantic/Reykjavik	Iceland
+Link	Africa/Nairobi		Indian/Antananarivo
+Link	Africa/Nairobi		Indian/Comoro
+Link	Africa/Nairobi		Indian/Mayotte
 Link	Asia/Tehran		Iran
 Link	Asia/Jerusalem		Israel
 Link	America/Jamaica		Jamaica
@@ -104,7 +181,9 @@ Link	Pacific/Chatham		NZ-CHAT
 Link	America/Denver		Navajo
 Link	Asia/Shanghai		PRC
 Link	Pacific/Honolulu	Pacific/Johnston
+Link	Pacific/Pago_Pago	Pacific/Midway
 Link	Pacific/Pohnpei		Pacific/Ponape
+Link	Pacific/Guam		Pacific/Saipan
 Link	Pacific/Pago_Pago	Pacific/Samoa
 Link	Pacific/Chuuk		Pacific/Truk
 Link	Pacific/Chuuk		Pacific/Yap
diff --git a/europe b/europe
index 1ba175f..d64198c 100644
--- a/europe
+++ b/europe
@@ -506,9 +506,6 @@ Zone	Europe/London	-0:01:15 -	LMT	1847 Dec  1  0:00s
 			 1:00	-	BST	1971 Oct 31  2:00u
 			 0:00	GB-Eire	%s	1996
 			 0:00	EU	GMT/BST
-Link	Europe/London	Europe/Jersey
-Link	Europe/London	Europe/Guernsey
-Link	Europe/London	Europe/Isle_of_Man
 
 # From Paul Eggert (2018-02-15):
 # In January 2018 we discovered that the negative SAVE values in the
@@ -1307,9 +1304,8 @@ Zone	Europe/Helsinki	1:39:49 -	LMT	1878 May 31
 			1:39:49	-	HMT	1921 May    # Helsinki Mean Time
 			2:00	Finland	EE%sT	1983
 			2:00	EU	EE%sT
-
 # Åland Is
-Link	Europe/Helsinki	Europe/Mariehamn
+# See Europe/Helsinki.
 
 
 # France
@@ -1505,8 +1501,7 @@ Zone	Europe/Berlin	0:53:28 -	LMT	1893 Apr
 
 # From Arthur David Olson (2012-03-03):
 # Büsingen and Zurich have shared clocks since 1970.
-
-Link	Europe/Zurich	Europe/Busingen
+# See Europe/Zurich.
 
 # Georgia
 # Please see the "asia" file for Asia/Tbilisi.
@@ -1800,9 +1795,6 @@ Zone	Europe/Rome	0:49:56 -	LMT	1866 Dec 12
 			1:00	Italy	CE%sT	1980
 			1:00	EU	CE%sT
 
-Link	Europe/Rome	Europe/Vatican
-Link	Europe/Rome	Europe/San_Marino
-
 # Latvia
 
 # From Liene Kanepe (1998-09-17):
@@ -1895,7 +1887,7 @@ Zone	Europe/Riga	1:36:34	-	LMT	1880
 # I could confirm from the paper that Liechtenstein did in fact follow
 # the same DST in 1941 and 1942 as Switzerland did.
 
-Link Europe/Zurich Europe/Vaduz
+# See Europe/Zurich.
 
 
 # Lithuania
@@ -2249,7 +2241,7 @@ Zone	Europe/Oslo	0:43:00 -	LMT	1895 Jan  1
 #
 # All these events predate our cutoff date of 1970, so use Europe/Oslo
 # for these regions.
-Link	Europe/Oslo	Arctic/Longyearbyen
+
 
 # Poland
 
@@ -3518,14 +3510,9 @@ Zone	Europe/Belgrade	1:22:00	-	LMT	1884
 # Shanks & Pottenger don't give as much detail, so go with Koželj.
 			1:00	-	CET	1982 Nov 27
 			1:00	EU	CE%sT
-Link Europe/Belgrade Europe/Ljubljana	# Slovenia
-Link Europe/Belgrade Europe/Podgorica	# Montenegro
-Link Europe/Belgrade Europe/Sarajevo	# Bosnia and Herzegovina
-Link Europe/Belgrade Europe/Skopje	# North Macedonia
-Link Europe/Belgrade Europe/Zagreb	# Croatia
 
 # Slovakia
-Link Europe/Prague Europe/Bratislava
+# See Europe/Prague.
 
 # Slovenia
 # See Europe/Belgrade.
@@ -3993,7 +3980,7 @@ Zone	Europe/Istanbul	1:55:52 -	LMT	1880
 			2:00	1:00	EEST	2015 Nov  8  1:00u
 			2:00	EU	EE%sT	2016 Sep  7
 			3:00	-	+03
-Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
+# See the 'backward' file for Asia/Istanbul.
 
 # Ukraine
 #
diff --git a/northamerica b/northamerica
index 724bda3..c7d9274 100644
--- a/northamerica
+++ b/northamerica
@@ -3184,6 +3184,9 @@ Zone Atlantic/Bermuda	-4:19:18 -	LMT	1890	# Hamilton
 			-4:00	Canada	A%sT	1976
 			-4:00	US	A%sT
 
+# Caribbean Netherlands
+# See America/Curacao.
+
 # Cayman Is
 # See America/Panama.
 
@@ -3723,7 +3726,6 @@ Zone	America/Managua	-5:45:08 -	LMT	1890
 Zone	America/Panama	-5:18:08 -	LMT	1890
 			-5:19:36 -	CMT	1908 Apr 22 # Colón Mean Time
 			-5:00	-	EST
-Link America/Panama America/Cayman
 
 # Puerto Rico
 # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
@@ -3748,6 +3750,9 @@ Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15 # St Pierre
 # St Vincent and the Grenadines
 # See America/Port_of_Spain.
 
+# Sint Maarten
+# See America/Curacao.
+
 # Turks and Caicos
 #
 # From Chris Dunn in
@@ -3817,7 +3822,7 @@ Zone America/Grand_Turk	-4:44:32 -	LMT	1890
 			-5:00	US	E%sT
 
 # British Virgin Is
-# Virgin Is
+# US Virgin Is
 # See America/Port_of_Spain.
 
 
diff --git a/southamerica b/southamerica
index beb3052..eb987c5 100644
--- a/southamerica
+++ b/southamerica
@@ -574,7 +574,7 @@ Zone America/Argentina/Ushuaia -4:33:12 - LMT	1894 Oct 31
 			-3:00	-	-03
 
 # Aruba
-Link America/Curacao America/Aruba
+# See America/Curacao.
 
 # Bolivia
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
@@ -1396,8 +1396,8 @@ Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12 # Willemstad
 # The name "Lower Prince's Quarter" is both longer than fourteen characters
 # and contains an apostrophe; use "Lower_Princes" below.
 
-Link	America/Curacao	America/Lower_Princes	# Sint Maarten
-Link	America/Curacao	America/Kralendijk	# Caribbean Netherlands
+# From Paul Eggert (2021-05-06):
+# These backward-compatibility links now are in the 'backward' file.
 
 # Ecuador
 #
@@ -1718,21 +1718,6 @@ Zone America/Paramaribo	-3:40:40 -	LMT	1911
 Zone America/Port_of_Spain -4:06:04 -	LMT	1912 Mar 2
 			-4:00	-	AST
 
-# These all agree with Trinidad and Tobago since 1970.
-Link America/Port_of_Spain America/Anguilla
-Link America/Port_of_Spain America/Antigua
-Link America/Port_of_Spain America/Dominica
-Link America/Port_of_Spain America/Grenada
-Link America/Port_of_Spain America/Guadeloupe
-Link America/Port_of_Spain America/Marigot	# St Martin (French part)
-Link America/Port_of_Spain America/Montserrat
-Link America/Port_of_Spain America/St_Barthelemy # St Barthélemy
-Link America/Port_of_Spain America/St_Kitts	# St Kitts & Nevis
-Link America/Port_of_Spain America/St_Lucia
-Link America/Port_of_Spain America/St_Thomas	# Virgin Islands (US)
-Link America/Port_of_Spain America/St_Vincent
-Link America/Port_of_Spain America/Tortola	# Virgin Islands (UK)
-
 # Uruguay
 # From Paul Eggert (1993-11-18):
 # Uruguay wins the prize for the strangest peacetime manipulation of the rules.
-- 
2.27.0

