Don’t merge Etc/* with location-based names

The previous patch merged Etc/* names with location-based ones;
for example, it made Asia/Bangkok an alias for Etc/GMT-7.
This may have been a step too far, for reasons discussed here:
https://mm.icann.org/pipermail/tz/2021-May/030109.html
Revert that part of the change, by undoing the problematic merges.
* NEWS, theory.html, zone.tab, zone1970.tab:
Document the partial reversion of the recent merges.
* africa (Africa/Abidjan):
* asia (Asia/Urumqi, NBorneo, Asia/Kuching, Indian/Maldives)
(Asia/Riyadh, Asia/Bangkok, Asia/Dubai):
* australasia (Pacific/Gambier, Pacific/Tahiti, Pacific/Tarawa)
(Pacific/Palau, Pacific/Port_Moresby, Pacific/Guadalcanal):
* southamerica (America/La_Paz, America/Cayenne)
(Atlantic/South_Georgia):
Move from ‘backzone’ back to here, and remove the corresponding
‘backward’ links.
* backward: Don’t link from Etc/* to a location name.
* backzone: Above data moved from here.

NEWS

@@ -26,22 +26,18 @@ Unreleased, experimental changes
     (Thanks to P Chan, Michael Deckers, Alexander Krivenyshev and
     Alois Treindl.)
 
-    Merge timezones whose timestamps agree since 1970, since pre-1970
-    timestamps are out of scope.  This change does not affect
+    Merge location-based timezones whose timestamps agree since 1970,
+    as pre-1970 timestamps are out of scope.  This does not affect
     post-1970 timestamps, and timezone historians who build with 'make
     PACKRATDATA=backzone' should see no changes to pre-1970 timestamps.
     When merging, keep the most-populous location's data, and move
     data for other locations to 'backzone' with a backward
-    compatibility link in 'backward'.  Also, merge timezones with
-    neither post-1970 clock changes nor alphabetic abbreviations into
-    their Etc counterparts.  For example, move the Europe/Oslo data to
+    link in 'backward'.  For example, move Europe/Oslo data to
     'backzone' with a link in 'backward' from Europe/Berlin because
     the two timezones' timestamps agree since 1970; this change
     affects some pre-1966 timestamps in Europe/Oslo because Berlin and
-    Oslo disagreed before 1966.  For another example, move the
-    Asia/Aden data to 'backzone' with a link in 'backward' from
-    Etc/GMT-3.  Affected entries range from Africa/Abidjan to
-    Pacific/Yap.
+    Oslo disagreed before 1966.  Affected entries range from
+    Africa/Accra to Pacific/Yap.
 
   Changes to maintenance procedure
 

africa

@@ -105,7 +105,7 @@ Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 16
 # See Africa/Maputo.
 
 # Burkina Faso
-# See Etc/GMT.
+# See Africa/Abidjan.
 
 # Burundi
 # See Africa/Maputo.
@@ -147,7 +147,9 @@ Zone	Africa/Ndjamena	1:00:12 -	LMT	1912        # N'Djamena
 # See Africa/Lagos.
 
 # Côte d'Ivoire / Ivory Coast
-# See Etc/GMT.
+# Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
+			 0:00	-	GMT
 
 # Djibouti
 # See Africa/Nairobi.
@@ -370,7 +372,7 @@ Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
 # The Gambia
 # Ghana
 # Guinea
-# See Etc/GMT.
+# See Africa/Abidjan.
 
 # Guinea-Bissau
 #
@@ -525,7 +527,7 @@ Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 
 # Mali
 # Mauritania
-# See Etc/GMT.
+# See Africa/Abidjan.
 
 # Mauritius
 
@@ -1269,7 +1271,7 @@ Zone	Africa/Lagos	0:13:35 -	LMT	1905 Jul  1
 			1:00	-	WAT
 
 # Réunion
-# See Etc/GMT-4.
+# See Asia/Dubai.
 #
 # Crozet Islands also observes Réunion time; see the 'antarctica' file.
 
@@ -1277,7 +1279,7 @@ Zone	Africa/Lagos	0:13:35 -	LMT	1905 Jul  1
 # See Africa/Maputo.
 
 # St Helena
-# See Etc/GMT.
+# See Africa/Abidjan.
 # The other parts of the St Helena territory are similar:
 #	Tristan da Cunha: on GMT, say Whitman and the CIA
 #	Ascension: on GMT, say the USNO (1995-12-21) and the CIA
@@ -1312,13 +1314,13 @@ Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
 			 0:00	-	GMT
 
 # Senegal
-# See Etc/GMT.
+# See Africa/Abidjan.
 
 # Seychelles
-# See Etc/GMT-4.
+# See Asia/Dubai.
 
 # Sierra Leone
-# See Etc/GMT.
+# See Africa/Abidjan.
 
 # Somalia
 # See Africa/Nairobi.
@@ -1383,7 +1385,7 @@ Zone	Africa/Juba	2:06:28 -	LMT	1931
 # See Africa/Nairobi.
 
 # Togo
-# See Etc/GMT.
+# See Africa/Abidjan.
 
 # Tunisia
 

antarctica

@@ -148,7 +148,7 @@ Zone Antarctica/Mawson	0	-	-00	1954 Feb 13
 #
 # Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
 #	sealing & whaling stations operated variously 1802/1911+;
-#	see Etc/GMT-4.
+#	see Asia/Dubai.
 #
 # Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
 # Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
@@ -157,10 +157,10 @@ Zone Antarctica/Mawson	0	-	-00	1954 Feb 13
 # St Paul Island - near Amsterdam, uninhabited
 #	fishing stations operated variously 1819/1931
 #
-# Kerguelen - see Etc/GMT-5.
+# Kerguelen - see Indian/Maldives.
 #
 # year-round base in the main continent
-# Dumont d'Urville - see Etc/GMT-10.
+# Dumont d'Urville - see Pacific/Port_Moresby.
 
 # France & Italy - year-round base
 # Concordia, -750600+1232000, since 2005
@@ -176,7 +176,7 @@ Zone Antarctica/Mawson	0	-	-00	1954 Feb 13
 # Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
 
 # Japan - year-round bases
-# See Etc/GMT-3.
+# See Asia/Riyadh.
 
 # S Korea - year-round base
 # Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
@@ -240,7 +240,7 @@ Zone Antarctica/Troll	0	-	-00	2005 Feb 12
 #	year-round from 1960/61 to 1992
 
 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
-# See Etc/GMT-6.
+# See Asia/Urumqi.
 
 # S Africa - year-round bases
 # Marion Island, -4653+03752

asia

@@ -255,7 +255,7 @@ Zone	Indian/Chagos	4:49:40	-	LMT	1907
 			6:00	-	+06
 
 # Brunei
-# See Etc/GMT-8.
+# See Asia/Kuching.
 
 # Burma / Myanmar
 
@@ -275,7 +275,7 @@ Zone	Asia/Yangon	6:24:47 -	LMT	1880        # or Rangoon
 			6:30	-	+0630
 
 # Cambodia
-# See Etc/GMT-7.
+# See Asia/Bangkok.
 
 
 # China
@@ -531,7 +531,7 @@ Rule	PRC	1987	1991	-	Apr	Sun>=11	 2:00	1:00	D
 # In earlier versions of this file, China had many separate Zone entries, but
 # this was based on what were apparently incorrect data in Shanks & Pottenger.
 # This has now been simplified to the two entries Asia/Shanghai and
-# Etc/GMT-6, with the others being links for backward compatibility.
+# Asia/Urumqi, with the others being links for backward compatibility.
 # Proposed in 1918 and theoretically in effect until 1949 (although in practice
 # mainly observed in coastal areas), the five zones were:
 #
@@ -553,7 +553,7 @@ Rule	PRC	1987	1991	-	Apr	Sun>=11	 2:00	1:00	D
 # Yangchun, Yangjiang, Yu'nan, and Yunfu.
 #
 # Xin-zang Time ("Xinjiang-Tibet Time") UT +06
-# This region is now part of either Etc/GMT-6 or Asia/Shanghai with
+# This region is now part of either Asia/Urumqi or Asia/Shanghai with
 # current boundaries uncertain; times before 1970 for areas that
 # disagree with Ürümqi or Shanghai are not recorded here.
 # The Gansu counties Aksay, Anxi, Dunhuang, Subei; west Qinghai;
@@ -606,14 +606,68 @@ Rule	PRC	1987	1991	-	Apr	Sun>=11	 2:00	1:00	D
 # 2. Kashi...
 # 3. Urumqi...
 # 4. Kashgar...
+# ...
+# 5. It seems that Uyghurs in Ürümqi has been using Xinjiang since at least the
+# 1960's. I know of one Han, now over 50, who grew up in the surrounding
+# countryside and used Xinjiang time as a child.
+#
+# 6. Likewise for Kashgar and the rest of south Xinjiang I don't know of any
+# start date for Xinjiang time.
+#
+# Without having access to local historical records, nor the ability to legally
+# publish them, I would go with October 1, 1949, when Xinjiang became the Uyghur
+# Autonomous Region under the PRC. (Before that Uyghurs, of course, would also
+# not be using Beijing time, but some local time.)
+
+# From David Cochrane (2014-03-26):
+# Just a confirmation that Ürümqi time was implemented in Ürümqi on 1 Feb 1986:
+# https://content.time.com/time/magazine/article/0,9171,960684,00.html
+
+# From Luther Ma (2014-04-22):
+# I have interviewed numerous people of various nationalities and from
+# different localities in Xinjiang and can confirm the information in Guo's
+# report regarding Xinjiang, as well as the Time article reference by David
+# Cochrane.  Whether officially recognized or not (and both are officially
+# recognized), two separate times have been in use in Xinjiang since at least
+# the Cultural Revolution: Xinjiang Time (XJT), aka Ürümqi Time or local time;
+# and Beijing Time.  There is no confusion in Xinjiang as to which name refers
+# to which time. Both are widely used in the province, although in some
+# population groups might be use one to the exclusion of the other.  The only
+# problem is that computers and smart phones list Ürümqi (or Kashgar) as
+# having the same time as Beijing.
+
+# From Paul Eggert (2014-06-30):
+# In the early days of the PRC, Tibet was given its own time zone (UT +06)
+# but this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
+# Memories of life in Lhasa under Chinese Rule, Columbia U Press, ISBN
+# 978-0231142861 (2008), translator's introduction by Matthew Akester, p x.
+# As this is before our 1970 cutoff, Tibet doesn't need a separate zone.
+#
+# Xinjiang Time is well-documented as being officially recognized.  E.g., see
+# "The Working-Calendar for The Xinjiang Uygur Autonomous Region Government"
+# <http://www.sinkiang.gov.cn/service/ourworking/> (2014-04-22).
+# Unfortunately, we have no good records of time in Xinjiang before 1986.
+# During the 20th century parts of Xinjiang were ruled by the Qing dynasty,
+# the Republic of China, various warlords, the First and Second East Turkestan
+# Republics, the Soviet Union, the Kuomintang, and the People's Republic of
+# China, and tracking down all these organizations' timekeeping rules would be
+# quite a trick.  Approximate this lost history by a transition from LMT to
+# UT +06 at the start of 1928, the year of accession of the warlord Jin Shuren,
+# which happens to be the date given by Shanks & Pottenger (no doubt as a
+# guess) as the transition from LMT.  Ignore the usage of +08 before
+# 1986-02-01 under the theory that the transition date to +08 is unknown and
+# that the sort of users who prefer Asia/Urumqi now typically ignored the
+# +08 mandate back then.
 
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 # Beijing time, used throughout China; represented by Shanghai.
 Zone	Asia/Shanghai	8:05:43	-	LMT	1901
 			8:00	Shang	C%sT	1949 May 28
 			8:00	PRC	C%sT
-# See Etc/GMT-6 for Xinjiang time, used by many in western China.
-# (Please use Asia/Shanghai if you prefer Beijing time.)
+# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
+# / Wulumuqi.  (Please use Asia/Shanghai if you prefer Beijing time.)
+Zone	Asia/Urumqi	5:50:20	-	LMT	1928
+			6:00	-	+06
 
 
 # Hong Kong
@@ -2636,10 +2690,10 @@ Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 Apr  1
 ###############################################################################
 
 # Kuwait
-# See Etc/GMT-3.
+# See Asia/Riyadh.
 
 # Laos
-# See Etc/GMT-7.
+# See Asia/Bangkok.
 
 
 # Lebanon
@@ -2673,12 +2727,28 @@ Zone	Asia/Beirut	2:22:00 -	LMT	1880
 			2:00	Lebanon	EE%sT
 
 # Malaysia
+# Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
+Rule	NBorneo	1935	1941	-	Sep	14	0:00	0:20	-
+Rule	NBorneo	1935	1941	-	Dec	14	0:00	0	-
+#
 # For peninsular Malaysia see Asia/Singapore.
-# For Sabah & Sarawak see Etc/GMT-8.
+#
+# Sabah & Sarawak
+# From Paul Eggert (2014-08-12):
+# The data entries here are mostly from Shanks & Pottenger, but the 1942, 1945
+# and 1982 transition dates are from Mok Ly Yng.
+# Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone Asia/Kuching	7:21:20	-	LMT	1926 Mar
+			7:30	-	+0730	1933
+			8:00 NBorneo  +08/+0820	1942 Feb 16
+			9:00	-	+09	1945 Sep 12
+			8:00	-	+08
 
 # Maldives
-# See Etc/GMT-5.
-
+# Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone	Indian/Maldives	4:54:00 -	LMT	1880 # Malé
+			4:54:00	-	MMT	1960 # Malé Mean Time
+			5:00	-	+05
 
 # Mongolia
 
@@ -2842,7 +2912,7 @@ Zone	Asia/Kathmandu	5:41:16 -	LMT	1920
 			5:45	-	+0545
 
 # Oman
-# See Etc/GMT-4.
+# See Asia/Dubai.
 
 # Pakistan
 
@@ -3439,7 +3509,50 @@ Zone	Asia/Qatar	3:26:08 -	LMT	1920     # Al Dawhah / Doha
 			3:00	-	+03
 
 # Saudi Arabia
-# See Etc/GMT-3.
+#
+# From Paul Eggert (2018-08-29):
+# Time in Saudi Arabia and other countries in the Arabian peninsula was not
+# standardized until 1968 or so; we don't know exactly when, and possibly it
+# has never been made official.  Richard P Hunt, in "Islam city yielding to
+# modern times", New York Times (1961-04-09), p 20, wrote that only airlines
+# observed standard time, and that people in Jeddah mostly observed quasi-solar
+# time, doing so by setting their watches at sunrise to 6 o'clock (or to 12
+# o'clock for "Arab" time).
+#
+# Timekeeping differed depending on who you were and which part of Saudi
+# Arabia you were in.  In 1969, Elias Antar wrote that although a common
+# practice had been to set one's watch to 12:00 (i.e., midnight) at sunset -
+# which meant that the time on one side of a mountain could differ greatly from
+# the time on the other side - many foreigners set their watches to 6pm
+# instead, while airlines instead used UTC +03 (except in Dhahran, where they
+# used UTC +04), Aramco used UTC +03 with DST, and the Trans-Arabian Pipe Line
+# Company used Aramco time in eastern Saudi Arabia and airline time in western.
+# (The American Military Aid Advisory Group used plain UTC.)  Antar writes,
+# "A man named Higgins, so the story goes, used to run a local power
+# station. One day, the whole thing became too much for Higgins and he
+# assembled his staff and laid down the law. 'I've had enough of this,' he
+# shrieked. 'It is now 12 o'clock Higgins Time, and from now on this station is
+# going to run on Higgins Time.' And so, until last year, it did."  See:
+# Antar E. Dinner at When? Saudi Aramco World, 1969 March/April. 2-3.
+# http://archive.aramcoworld.com/issue/196902/dinner.at.when.htm
+# Also see: Antar EN. Arabian flying is confusing.
+# Port Angeles (WA) Evening News. 1965-03-10. page 3.
+#
+# The TZ database cannot represent quasi-solar time; airline time is the best
+# we can do.  The 1946 foreign air news digest of the U.S. Civil Aeronautics
+# Board (OCLC 42299995) reported that the "... Arabian Government, inaugurated
+# a weekly Dhahran-Cairo service, via the Saudi Arabian cities of Riyadh and
+# Jidda, on March 14, 1947".  Shanks & Pottenger guessed 1950; go with the
+# earlier date.
+#
+# Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
+# time zones; the other zone, at UT +04, was in the far eastern part of
+# the country.  Presumably this is documenting airline time.  Ignore this,
+# as it's before our 1970 cutoff.
+#
+# Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone	Asia/Riyadh	3:06:52 -	LMT	1947 Mar 14
+			3:00	-	+03
 
 # Singapore
 # taken from Mok Ly Yng (2003-10-30)
@@ -3692,7 +3805,10 @@ Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
 			5:00	-	+05
 
 # Thailand
-# See Etc/GMT-7.
+# Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone	Asia/Bangkok	6:42:04	-	LMT	1880
+			6:42:04	-	BMT	1920 Apr # Bangkok Mean Time
+			7:00	-	+07
 
 # Turkmenistan
 # From Shanks & Pottenger.
@@ -3704,7 +3820,9 @@ Zone	Asia/Ashgabat	3:53:32 -	LMT	1924 May  2 # or Ashkhabad
 			5:00	-	+05
 
 # United Arab Emirates
-# See Etc/GMT-4.
+# Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone	Asia/Dubai	3:41:12 -	LMT	1920
+			4:00	-	+04
 
 # Uzbekistan
 # Byalokoz 1919 says Uzbekistan was 4:27:53.
@@ -3794,9 +3912,9 @@ Zone Asia/Ho_Chi_Minh	7:06:40 -	LMT	1906 Jul  1
 # details are unknown and would likely be too voluminous for this database.
 #
 # For timestamps in north Vietnam back to 1970 (the tzdb cutoff),
-# use Etc/GMT-7; see the VN entries in the file zone1970.tab.
+# use Asia/Bangkok; see the VN entries in the file zone1970.tab.
 # For timestamps before 1970, see Asia/Hanoi in the file 'backzone'.
 
 
 # Yemen
-# See Etc/GMT-3.
+# See Asia/Riyadh.

australasia

@@ -252,7 +252,7 @@ Zone Antarctica/Macquarie 0	-	-00	1899 Nov
 			10:00	AT	AE%sT
 
 # Christmas
-# See Etc/GMT-7.
+# See Asia/Bangkok.
 
 # Cocos (Keeling) Is
 # See Asia/Yangon.
@@ -403,9 +403,12 @@ Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26 # Suva
 
 # French Polynesia
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Gambier	 -8:59:48 -	LMT	1912 Oct # Rikitea
+			 -9:00	-	-09
 Zone	Pacific/Marquesas -9:18:00 -	LMT	1912 Oct
 			 -9:30	-	-0930
-# See Etc/GMT+9 for the Gambier Islands and Etc/GMT+10 for the Society Islands.
+Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct # Papeete
+			-10:00	-	-10
 # Clipperton (near North America) is administered from French Polynesia;
 # it is uninhabited.
 
@@ -451,8 +454,9 @@ Zone	Pacific/Guam	-14:21:00 -	LMT	1844 Dec 31
 			10:00	-	ChST	# Chamorro Standard Time
 
 # Kiribati
-# See Etc/GMT-12 for the Gilbert Islands.
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Tarawa	 11:32:04 -	LMT	1901 # Bairiki
+			 12:00	-	+12
 Zone Pacific/Enderbury	-11:24:20 -	LMT	1901
 			-12:00	-	-12	1979 Oct
 			-11:00	-	-11	1994 Dec 31
@@ -466,7 +470,7 @@ Zone Pacific/Kiritimati	-10:29:20 -	LMT	1901
 # See Pacific/Guam.
 
 # Marshall Is
-# See Etc/GMT-12 for most locations.
+# See Pacific/Tarawa for most locations.
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Kwajalein	 11:09:20 -	LMT	1901
 			 11:00	-	+11	1937
@@ -477,8 +481,8 @@ Zone Pacific/Kwajalein	 11:09:20 -	LMT	1901
 			 12:00	-	+12
 
 # Micronesia
-# For Chuuk and Yap see Etc/GMT-10.
-# For Pohnpei see Etc/GMT-11.
+# For Chuuk and Yap see Pacific/Port_Moresby.
+# For Pohnpei see Pacific/Guadalcanal.
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Kosrae	-13:08:04 -	LMT	1844 Dec 31
 			 10:51:56 -	LMT	1901
@@ -628,10 +632,16 @@ Zone	Pacific/Norfolk	11:11:52 -	LMT	1901 # Kingston
 			11:00	AN	+11/+12
 
 # Palau (Belau)
-# See Etc/GMT-9.
+# Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Palau	-15:02:04 -	LMT	1844 Dec 31	# Koror
+			  8:57:56 -	LMT	1901
+			  9:00	-	+09
 
 # Papua New Guinea
-# See Etc/GMT-10 for most locations.
+# Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
+			9:48:32	-	PMMT	1895 # Port Moresby Mean Time
+			10:00	-	+10
 #
 # From Paul Eggert (2014-10-13):
 # Base the Bougainville entry on the Arawa-Kieta region, which appears to have
@@ -751,8 +761,9 @@ Zone Pacific/Apia	 12:33:04 -	LMT	1892 Jul  5
 
 # Solomon Is
 # excludes Bougainville, for which see Papua New Guinea
-# See Etc/GMT-11.
-
+# Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct # Honiara
+			11:00	-	+11
 
 # Tokelau
 #
@@ -793,7 +804,7 @@ Zone Pacific/Tongatapu	12:19:12 -	LMT	1945 Sep 10
 			13:00	Tonga	+13/+14
 
 # Tuvalu
-# See Etc/GMT-12.
+# See Pacific/Tarawa.
 
 
 # US minor outlying islands
@@ -852,7 +863,7 @@ Zone Pacific/Tongatapu	12:19:12 -	LMT	1945 Sep 10
 # uninhabited since World War II; was probably like Pacific/Kiritimati
 
 # Wake
-# See Etc/GMT-12.
+# See Pacific/Tarawa.
 
 
 # Vanuatu
@@ -891,7 +902,7 @@ Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
 			11:00	Vanuatu	+11/+12
 
 # Wallis and Futuna
-# See Etc/GMT-12.
+# See Pacific/Tarawa.
 
 ###############################################################################
 
@@ -1951,6 +1962,9 @@ Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
 # From Michael Deckers (2019-08-14):
 # https://www.legislation.gov.au/Details/F2019C00010
 
+# Palau
+# See commentary for Micronesia.
+
 # Pitcairn
 
 # From Rives McDow (1999-11-08):

backward

@@ -10,30 +10,29 @@
 # for pre-1970 timestamps and so is out of scope for tzdb proper.
 
 # Link	TARGET			LINK-NAME
-Link	Etc/GMT			Africa/Abidjan
-Link	Etc/GMT			Africa/Accra
+Link	Africa/Abidjan		Africa/Accra
 Link	Africa/Nairobi		Africa/Addis_Ababa
 Link	Africa/Nairobi		Africa/Asmara
 Link	Africa/Nairobi		Africa/Asmera
-Link	Etc/GMT			Africa/Bamako
+Link	Africa/Abidjan		Africa/Bamako
 Link	Africa/Lagos		Africa/Bangui
-Link	Etc/GMT			Africa/Banjul
+Link	Africa/Abidjan		Africa/Banjul
 Link	Africa/Maputo		Africa/Blantyre
 Link	Africa/Lagos		Africa/Brazzaville
 Link	Africa/Maputo		Africa/Bujumbura
-Link	Etc/GMT			Africa/Conakry
-Link	Etc/GMT			Africa/Dakar
+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	Etc/GMT			Africa/Freetown
+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	Etc/GMT			Africa/Lome
+Link	Africa/Abidjan		Africa/Lome
 Link	Africa/Lagos		Africa/Luanda
 Link	Africa/Maputo		Africa/Lubumbashi
 Link	Africa/Maputo		Africa/Lusaka
@@ -42,10 +41,10 @@ Link	Africa/Johannesburg	Africa/Maseru
 Link	Africa/Johannesburg	Africa/Mbabane
 Link	Africa/Nairobi		Africa/Mogadishu
 Link	Africa/Lagos		Africa/Niamey
-Link	Etc/GMT			Africa/Nouakchott
-Link	Etc/GMT			Africa/Ouagadougou
+Link	Africa/Abidjan		Africa/Nouakchott
+Link	Africa/Abidjan		Africa/Ouagadougou
 Link	Africa/Lagos		Africa/Porto-Novo
-Link	Etc/GMT			Africa/Timbuktu
+Link	Africa/Abidjan		Africa/Timbuktu
 Link	America/Puerto_Rico	America/Anguilla
 Link	America/Puerto_Rico	America/Antigua
 Link	America/Argentina/Catamarca	America/Argentina/ComodRivadavia
@@ -55,7 +54,6 @@ Link	America/Adak		America/Atka
 Link	America/Puerto_Rico	America/Blanc-Sablon
 Link	America/Argentina/Buenos_Aires	America/Buenos_Aires
 Link	America/Argentina/Catamarca	America/Catamarca
-Link	Etc/GMT+3		America/Cayenne
 Link	America/Panama		America/Cayman
 Link	America/Panama		America/Coral_Harbour
 Link	America/Argentina/Cordoba	America/Cordoba
@@ -71,7 +69,6 @@ Link	America/Indiana/Indianapolis	America/Indianapolis
 Link	America/Argentina/Jujuy	America/Jujuy
 Link	America/Indiana/Knox	America/Knox_IN
 Link	America/Puerto_Rico	America/Kralendijk
-Link	Etc/GMT+4		America/La_Paz
 Link	America/Kentucky/Louisville	America/Louisville
 Link	America/Puerto_Rico	America/Lower_Princes
 Link	America/Puerto_Rico	America/Marigot
@@ -91,46 +88,40 @@ Link	America/Puerto_Rico	America/St_Thomas
 Link	America/Puerto_Rico	America/St_Vincent
 Link	America/Puerto_Rico	America/Tortola
 Link	America/Puerto_Rico	America/Virgin
-Link	Etc/GMT-10		Antarctica/DumontDUrville
+Link	Pacific/Port_Moresby	Antarctica/DumontDUrville
 Link	Pacific/Auckland	Antarctica/McMurdo
 Link	Pacific/Auckland	Antarctica/South_Pole
-Link	Etc/GMT-3		Antarctica/Syowa
-Link	Etc/GMT-6		Antarctica/Vostok
+Link	Asia/Riyadh		Antarctica/Syowa
+Link	Asia/Urumqi		Antarctica/Vostok
 Link	Europe/Berlin		Arctic/Longyearbyen
-Link	Etc/GMT-3		Asia/Aden
+Link	Asia/Riyadh		Asia/Aden
 Link	Asia/Ashgabat		Asia/Ashkhabad
 Link	Asia/Qatar		Asia/Bahrain
-Link	Etc/GMT-7		Asia/Bangkok
-Link	Etc/GMT-8		Asia/Brunei
+Link	Asia/Kuching		Asia/Brunei
 Link	Asia/Kolkata		Asia/Calcutta
 Link	Asia/Shanghai		Asia/Chongqing
 Link	Asia/Shanghai		Asia/Chungking
 Link	Asia/Dhaka		Asia/Dacca
-Link	Etc/GMT-4		Asia/Dubai
 Link	Asia/Shanghai		Asia/Harbin
 Link	Europe/Istanbul		Asia/Istanbul
-Link	Etc/GMT-6		Asia/Kashgar
+Link	Asia/Urumqi		Asia/Kashgar
 Link	Asia/Kathmandu		Asia/Katmandu
 Link	Asia/Singapore		Asia/Kuala_Lumpur
-Link	Etc/GMT-8		Asia/Kuching
-Link	Etc/GMT-3		Asia/Kuwait
+Link	Asia/Riyadh		Asia/Kuwait
 Link	Asia/Macau		Asia/Macao
-Link	Etc/GMT-4		Asia/Muscat
-Link	Etc/GMT-7		Asia/Phnom_Penh
+Link	Asia/Dubai		Asia/Muscat
+Link	Asia/Bangkok		Asia/Phnom_Penh
 Link	Asia/Yangon		Asia/Rangoon
-Link	Etc/GMT-3		Asia/Riyadh
 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	Etc/GMT-6		Asia/Urumqi
-Link	Etc/GMT-7		Asia/Vientiane
+Link	Asia/Bangkok		Asia/Vientiane
 Link	Atlantic/Faroe		Atlantic/Faeroe
 Link	Europe/Berlin		Atlantic/Jan_Mayen
-Link	Etc/GMT			Atlantic/Reykjavik
-Link	Etc/GMT+2		Atlantic/South_Georgia
-Link	Etc/GMT			Atlantic/St_Helena
+Link	Africa/Abidjan		Atlantic/Reykjavik
+Link	Africa/Abidjan		Atlantic/St_Helena
 Link	Australia/Sydney	Australia/ACT
 Link	Australia/Sydney	Australia/Canberra
 Link	Australia/Hobart	Australia/Currie
@@ -194,16 +185,15 @@ Link	Etc/GMT			GMT-0
 Link	Etc/GMT			GMT0
 Link	Etc/GMT			Greenwich
 Link	Asia/Hong_Kong		Hongkong
-Link	Etc/GMT			Iceland
+Link	Africa/Abidjan		Iceland
 Link	Africa/Nairobi		Indian/Antananarivo
-Link	Etc/GMT-7		Indian/Christmas
+Link	Asia/Bangkok		Indian/Christmas
 Link	Asia/Yangon		Indian/Cocos
 Link	Africa/Nairobi		Indian/Comoro
-Link	Etc/GMT-5		Indian/Kerguelen
-Link	Etc/GMT-4		Indian/Mahe
-Link	Etc/GMT-5		Indian/Maldives
+Link	Indian/Maldives		Indian/Kerguelen
+Link	Asia/Dubai		Indian/Mahe
 Link	Africa/Nairobi		Indian/Mayotte
-Link	Etc/GMT-4		Indian/Reunion
+Link	Asia/Dubai		Indian/Reunion
 Link	Asia/Tehran		Iran
 Link	Asia/Jerusalem		Israel
 Link	America/Jamaica		Jamaica
@@ -217,25 +207,19 @@ Link	Pacific/Auckland	NZ
 Link	Pacific/Chatham		NZ-CHAT
 Link	America/Denver		Navajo
 Link	Asia/Shanghai		PRC
-Link	Etc/GMT-10		Pacific/Chuuk
-Link	Etc/GMT-12		Pacific/Funafuti
-Link	Etc/GMT+9		Pacific/Gambier
-Link	Etc/GMT-11		Pacific/Guadalcanal
+Link	Pacific/Port_Moresby	Pacific/Chuuk
+Link	Pacific/Tarawa		Pacific/Funafuti
 Link	Pacific/Honolulu	Pacific/Johnston
-Link	Etc/GMT-12		Pacific/Majuro
+Link	Pacific/Tarawa		Pacific/Majuro
 Link	Pacific/Pago_Pago	Pacific/Midway
-Link	Etc/GMT-9		Pacific/Palau
-Link	Etc/GMT-11		Pacific/Pohnpei
-Link	Etc/GMT-11		Pacific/Ponape
-Link	Etc/GMT-10		Pacific/Port_Moresby
+Link	Pacific/Guadalcanal	Pacific/Pohnpei
+Link	Pacific/Guadalcanal	Pacific/Ponape
 Link	Pacific/Guam		Pacific/Saipan
 Link	Pacific/Pago_Pago	Pacific/Samoa
-Link	Etc/GMT+10		Pacific/Tahiti
-Link	Etc/GMT-12		Pacific/Tarawa
-Link	Etc/GMT-10		Pacific/Truk
-Link	Etc/GMT-12		Pacific/Wake
-Link	Etc/GMT-12		Pacific/Wallis
-Link	Etc/GMT-10		Pacific/Yap
+Link	Pacific/Port_Moresby	Pacific/Truk
+Link	Pacific/Tarawa		Pacific/Wake
+Link	Pacific/Tarawa		Pacific/Wallis
+Link	Pacific/Port_Moresby	Pacific/Yap
 Link	Europe/Warsaw		Poland
 Link	Europe/Lisbon		Portugal
 Link	Asia/Taipei		ROC

backzone

@@ -72,11 +72,6 @@
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
 
 
-# Côte d'Ivoire / Ivory Coast
-Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
-			 0:00	-	GMT
-
-
 # Ghana
 
 # From P Chan (2020-11-20):
@@ -518,11 +513,6 @@ Zone America/Blanc-Sablon -3:48:28 -	LMT	1884
 			-4:00	Canada	A%sT	1970
 			-4:00	-	AST
 
-# French Guiana
-Zone	America/Cayenne	-3:29:20 -	LMT	1911 Jul
-			-4:00	-	-04	1967 Oct
-			-3:00	-	-03
-
 # Cayman Is
 Zone	America/Cayman	-5:25:32 -	LMT	1890     # Georgetown
 			-5:07:10 -	KMT	1912 Feb # Kingston Mean Time
@@ -644,11 +634,6 @@ Zone	America/Grenada	-4:07:00 -	LMT	1911 Jul # St George's
 Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun  8 # Pointe-à-Pitre
 			-4:00	 -	AST
 
-# Bolivia
-Zone	America/La_Paz	-4:32:36 -	LMT	1890
-			-4:32:36 -	CMT	1931 Oct 15 # Calamarca MT
-			-4:32:36 1:00	BST	1932 Mar 21 # Bolivia ST
-			-4:00	-	-04
 
 # Canada
 #
@@ -902,11 +887,6 @@ Zone	Asia/Bahrain	3:22:20 -	LMT	1941 Jul 20  # Manamah
 			4:00	-	+04	1972 Jun
 			3:00	-	+03
 
-# Thailand
-Zone	Asia/Bangkok	6:42:04	-	LMT	1880
-			6:42:04	-	BMT	1920 Apr # Bangkok Mean Time
-			7:00	-	+07
-
 # Brunei
 Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar # Bandar Seri Begawan
 			7:30	-	+0730	1933
@@ -937,10 +917,6 @@ Zone	Asia/Chongqing	7:06:20	-	LMT	1928     # or Chungking
 			8:00	PRC	C%sT
 Link Asia/Chongqing Asia/Chungking
 
-# United Arab Emirates
-Zone	Asia/Dubai	3:41:12 -	LMT	1920
-			4:00	-	+04
-
 # Vietnam
 # From Paul Eggert (2014-10-13):
 # See Asia/Ho_Chi_Minh for the source for this data.
@@ -984,18 +960,6 @@ Zone Asia/Kuala_Lumpur	6:46:46 -	LMT	1901 Jan  1
 			9:00	-	+09	1945 Sep 12
 			7:30	-	+0730	1982 Jan  1
 			8:00	-	+08
-#
-# Sabah & Sarawak
-# From Paul Eggert (2014-08-12):
-# The data entries here are mostly from Shanks & Pottenger, but the 1942, 1945
-# and 1982 transition dates are from Mok Ly Yng.
-Rule	NBorneo	1935	1941	-	Sep	14	0:00	0:20	-
-Rule	NBorneo	1935	1941	-	Dec	14	0:00	0	-
-Zone Asia/Kuching	7:21:20	-	LMT	1926 Mar
-			7:30	-	+0730	1933
-			8:00 NBorneo  +08/+0820	1942 Feb 16
-			9:00	-	+09	1945 Sep 12
-			8:00	-	+08
 
 # Kuwait
 Zone	Asia/Kuwait	3:11:56 -	LMT	1950
@@ -1046,118 +1010,11 @@ Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jul  1
 			9:00	-	+09	1945 Sep  2
 			7:00	-	+07
 
-# Saudi Arabia
-#
-# From Paul Eggert (2018-08-29):
-# Time in Saudi Arabia and other countries in the Arabian peninsula was not
-# standardized until 1968 or so; we don't know exactly when, and possibly it
-# has never been made official.  Richard P Hunt, in "Islam city yielding to
-# modern times", New York Times (1961-04-09), p 20, wrote that only airlines
-# observed standard time, and that people in Jeddah mostly observed quasi-solar
-# time, doing so by setting their watches at sunrise to 6 o'clock (or to 12
-# o'clock for "Arab" time).
-#
-# Timekeeping differed depending on who you were and which part of Saudi
-# Arabia you were in.  In 1969, Elias Antar wrote that although a common
-# practice had been to set one's watch to 12:00 (i.e., midnight) at sunset -
-# which meant that the time on one side of a mountain could differ greatly from
-# the time on the other side - many foreigners set their watches to 6pm
-# instead, while airlines instead used UTC +03 (except in Dhahran, where they
-# used UTC +04), Aramco used UTC +03 with DST, and the Trans-Arabian Pipe Line
-# Company used Aramco time in eastern Saudi Arabia and airline time in western.
-# (The American Military Aid Advisory Group used plain UTC.)  Antar writes,
-# "A man named Higgins, so the story goes, used to run a local power
-# station. One day, the whole thing became too much for Higgins and he
-# assembled his staff and laid down the law. 'I've had enough of this,' he
-# shrieked. 'It is now 12 o'clock Higgins Time, and from now on this station is
-# going to run on Higgins Time.' And so, until last year, it did."  See:
-# Antar E. Dinner at When? Saudi Aramco World, 1969 March/April. 2-3.
-# http://archive.aramcoworld.com/issue/196902/dinner.at.when.htm
-# Also see: Antar EN. Arabian flying is confusing.
-# Port Angeles (WA) Evening News. 1965-03-10. page 3.
-#
-# The TZ database cannot represent quasi-solar time; airline time is the best
-# we can do.  The 1946 foreign air news digest of the U.S. Civil Aeronautics
-# Board (OCLC 42299995) reported that the "... Arabian Government, inaugurated
-# a weekly Dhahran-Cairo service, via the Saudi Arabian cities of Riyadh and
-# Jidda, on March 14, 1947".  Shanks & Pottenger guessed 1950; go with the
-# earlier date.
-#
-# Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
-# time zones; the other zone, at UT +04, was in the far eastern part of
-# the country.  Presumably this is documenting airline time.  Ignore this,
-# as it's before our 1970 cutoff.
-#
-Zone	Asia/Riyadh	3:06:52 -	LMT	1947 Mar 14
-			3:00	-	+03
-
-
 # Israel
 Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
 			2:21	-	JMT	1918
 			2:00	Zion	I%sT
 
-
-# Xinjiang
-
-# From Luther Ma (2009-11-19):
-# It seems that Uyghurs in Ürümqi has been using Xinjiang since at least the
-# 1960's. I know of one Han, now over 50, who grew up in the surrounding
-# countryside and used Xinjiang time as a child.
-#
-# 6. Likewise for Kashgar and the rest of south Xinjiang I don't know of any
-# start date for Xinjiang time.
-#
-# Without having access to local historical records, nor the ability to legally
-# publish them, I would go with October 1, 1949, when Xinjiang became the Uyghur
-# Autonomous Region under the PRC. (Before that Uyghurs, of course, would also
-# not be using Beijing time, but some local time.)
-
-# From David Cochrane (2014-03-26):
-# Just a confirmation that Ürümqi time was implemented in Ürümqi on 1 Feb 1986:
-# https://content.time.com/time/magazine/article/0,9171,960684,00.html
-
-# From Luther Ma (2014-04-22):
-# I have interviewed numerous people of various nationalities and from
-# different localities in Xinjiang and can confirm the information in Guo's
-# report regarding Xinjiang, as well as the Time article reference by David
-# Cochrane.  Whether officially recognized or not (and both are officially
-# recognized), two separate times have been in use in Xinjiang since at least
-# the Cultural Revolution: Xinjiang Time (XJT), aka Ürümqi Time or local time;
-# and Beijing Time.  There is no confusion in Xinjiang as to which name refers
-# to which time. Both are widely used in the province, although in some
-# population groups might be use one to the exclusion of the other.  The only
-# problem is that computers and smart phones list Ürümqi (or Kashgar) as
-# having the same time as Beijing.
-
-# From Paul Eggert (2014-06-30):
-# In the early days of the PRC, Tibet was given its own time zone (UT +06)
-# but this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
-# Memories of life in Lhasa under Chinese Rule, Columbia U Press, ISBN
-# 978-0231142861 (2008), translator's introduction by Matthew Akester, p x.
-# As this is before our 1970 cutoff, Tibet doesn't need a separate zone.
-#
-# Xinjiang Time is well-documented as being officially recognized.  E.g., see
-# "The Working-Calendar for The Xinjiang Uygur Autonomous Region Government"
-# <http://www.sinkiang.gov.cn/service/ourworking/> (2014-04-22).
-# Unfortunately, we have no good records of time in Xinjiang before 1986.
-# During the 20th century parts of Xinjiang were ruled by the Qing dynasty,
-# the Republic of China, various warlords, the First and Second East Turkestan
-# Republics, the Soviet Union, the Kuomintang, and the People's Republic of
-# China, and tracking down all these organizations' timekeeping rules would be
-# quite a trick.  Approximate this lost history by a transition from LMT to
-# UT +06 at the start of 1928, the year of accession of the warlord Jin Shuren,
-# which happens to be the date given by Shanks & Pottenger (no doubt as a
-# guess) as the transition from LMT.  Ignore the usage of +08 before
-# 1986-02-01 under the theory that the transition date to +08 is unknown and
-# that the sort of users who prefer Etc/GMT-6 now typically ignored the
-# +08 mandate back then.
-
-# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
-# / Wulumuqi.  (Please use Asia/Shanghai if you prefer Beijing time.)
-Zone	Asia/Urumqi	5:50:20	-	LMT	1928
-			6:00	-	+06
-
 # Laos
 # From Paul Eggert (2014-10-11):
 # See Asia/Ho_Chi_Minh for the source for most of this data.
@@ -1235,10 +1092,6 @@ Zone Atlantic/Reykjavik	-1:28	-	LMT	1908
 			 0:00	-	GMT
 Link Atlantic/Reykjavik Iceland
 
-# South Georgia
-Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890 # Grytviken
-			-2:00	-	-02
-
 # St Helena
 Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890 # Jamestown
 			-0:22:48 -	JMT	1951 # Jamestown Mean Time
@@ -1674,11 +1527,6 @@ Zone	Indian/Mahe	3:41:48 -	LMT	1907 Jan  1 # Victoria
 # Possibly the islands were uninhabited.
 
 
-# Maldives
-Zone	Indian/Maldives	4:54:00 -	LMT	1880 # Malé
-			4:54:00	-	MMT	1960 # Malé Mean Time
-			5:00	-	+05
-
 # Mayotte
 Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul # Mamoutzou
 			3:00	-	EAT
@@ -1722,14 +1570,6 @@ Link Pacific/Chuuk Pacific/Yap
 Zone Pacific/Funafuti	11:56:52 -	LMT	1901
 			12:00	-	+12
 
-# Gambier Islands
-Zone	Pacific/Gambier	 -8:59:48 -	LMT	1912 Oct # Rikitea
-			 -9:00	-	-09
-
-# Solomon Islands
-Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct # Honiara
-			11:00	-	+11
-
 # Johnston
 Zone Pacific/Johnston	-10:00	-	HST
 
@@ -1760,12 +1600,6 @@ Zone Pacific/Midway	-11:49:28 -	LMT	1901
 			-11:00	1:00	-10	1956 Sep  2
 			-11:00	-	-11
 
-# Palau (Belau)
-# See commentary for Micronesia in 'australasia'.
-Zone Pacific/Palau	-15:02:04 -	LMT	1844 Dec 31	# Koror
-			  8:57:56 -	LMT	1901
-			  9:00	-	+09
-
 # Micronesia
 # See commentary for Micronesia in 'australasia'.
 Zone Pacific/Pohnpei	-13:27:08 -	LMT	1844 Dec 31	# Kolonia
@@ -1778,11 +1612,6 @@ Zone Pacific/Pohnpei	-13:27:08 -	LMT	1844 Dec 31	# Kolonia
 			 11:00	-	+11
 Link Pacific/Pohnpei Pacific/Ponape
 
-# Papua New Guinea
-Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
-			9:48:32	-	PMMT	1895 # Port Moresby Mean Time
-			10:00	-	+10
-
 # N Mariana Is
 Zone Pacific/Saipan	-14:17:00 -	LMT	1844 Dec 31
 			 9:43:00 -	LMT	1901
@@ -1790,14 +1619,6 @@ Zone Pacific/Saipan	-14:17:00 -	LMT	1844 Dec 31
 			10:00	-	+10	2000 Dec 23
 			10:00	-	ChST	# Chamorro Standard Time
 
-# Society Islands
-Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct # Papeete
-			-10:00	-	-10
-
-# Gilbert Islands
-Zone Pacific/Tarawa	 11:32:04 -	LMT	1901 # Bairiki
-			 12:00	-	+12
-
 
 # Wake
 

etcetera

@@ -12,8 +12,6 @@
 # Starting with POSIX 1003.1-2001, the entries below are all
 # unnecessary as settings for the TZ environment variable.  E.g.,
 # instead of TZ='Etc/GMT+4' one can use the POSIX setting TZ='<-04>+4'.
-# However, some entries are needed if 'backward' is used:
-# for example, the 'backward' file links Etc/GMT to Africa/Abidjan.
 #
 # Do not use a POSIX TZ setting like TZ='GMT+4', which is four hours
 # behind GMT but uses the completely misleading abbreviation "GMT".

europe

@@ -1569,7 +1569,7 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 Nov  1
 			1:00	EU	CE%sT
 
 # Iceland
-# See Etc/GMT.
+# See Africa/Abidjan.
 
 # Italy
 #

southamerica

@@ -577,8 +577,11 @@ Zone America/Argentina/Ushuaia -4:33:12 - LMT	1894 Oct 31
 # See America/Puerto_Rico.
 
 # Bolivia
-# See Etc/GMT+4.
-
+# Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone	America/La_Paz	-4:32:36 -	LMT	1890
+			-4:32:36 -	CMT	1931 Oct 15 # Calamarca MT
+			-4:32:36 1:00	BST	1932 Mar 21 # Bolivia ST
+			-4:00	-	-04
 
 # Brazil
 
@@ -1510,8 +1513,10 @@ Zone Atlantic/Stanley	-3:51:24 -	LMT	1890
 			-3:00	-	-03
 
 # French Guiana
-# See Etc/GMT+3.
-
+# Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone America/Cayenne	-3:29:20 -	LMT	1911 Jul
+			-4:00	-	-04	1967 Oct
+			-3:00	-	-03
 
 # Guyana
 
@@ -1672,7 +1677,9 @@ Zone	America/Lima	-5:08:12 -	LMT	1890
 			-5:00	Peru	-05/-04
 
 # South Georgia
-# See Etc/GMT+2.
+# Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
+Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890 # Grytviken
+			-2:00	-	-02
 
 # South Sandwich Is
 # uninhabited; scientific personnel have wintered

theory.html

@@ -476,7 +476,7 @@ in decreasing order of importance:
     <p>
     <small>These abbreviations are:
       AMT Asunción, Athens;
-      BMT Baghdad, Batavia, Bermuda, Bern, Bogotá, Bridgetown,
+      BMT Baghdad, Bangkok, Batavia, Bermuda, Bern, Bogotá, Bridgetown,
         Brussels, Bucharest;
       CMT Calamarca, Caracas, Chisinau, Colón, Córdoba;
       DMT Dublin/Dunsink;
@@ -493,6 +493,7 @@ in decreasing order of importance:
 	Moratuwa, Moscow;
       PLMT Phù Liễn;
       PMT Paramaribo, Paris, Perm, Pontianak, Prague;
+      PMMT Port Moresby;
       QMT Quito;
       RMT Rangoon, Riga, Rome;
       SDMT Santo Domingo;
@@ -754,7 +755,7 @@ href="https://www.dissentmagazine.org/blog/booked-a-global-history-of-time-vanes
     such as that required by POSIX.
     If <abbr>DST</abbr> is not used a different time zone
     can often do the trick; for example, in Kenya a <code>TZ</code> setting
-    like <code>&lt;-03&gt;3</code> starts
+    like <code>&lt;-03&gt;3</code> or <code>America/Cayenne</code> starts
     the day six hours later than <code>Africa/Nairobi</code> does.
   </li>
   <li>
@@ -1235,11 +1236,11 @@ based on guesswork and these guesses may be corrected or improved.
 
 <p>
 Timezone boundaries are not part of the stable interface.
-For example, even though the <samp>Asia/Singapore</samp> timezone
-currently includes peninsular Malaysia as well as Singapore, this is not part
+For example, even though the <samp>Asia/Bangkok</samp> timezone
+currently includes Chang Mai, Hanoi, and Phnom Penh, this is not part
 of the stable interface and the timezone can split at any time.
 If a calendar application records a future event in some location other
-than Singapore by putting "<samp>Asia/Singapore</samp>" in the event's record,
+than Bangkok by putting "<samp>Asia/Bangkok</samp>" in the event's record,
 the application should be robust in the presence of timezone splits
 between now and the future time.
 </p>

zone.tab

@@ -27,7 +27,7 @@
 #country-
 #code	coordinates	TZ			comments
 AD	+4230+00131	Europe/Andorra
-AE	+2518+05518	Etc/GMT-4
+AE	+2518+05518	Asia/Dubai
 AF	+3431+06912	Asia/Kabul
 AG	+1703-06148	America/Puerto_Rico
 AI	+1812-06304	America/Puerto_Rico
@@ -37,13 +37,13 @@ AO	-0848+01314	Africa/Lagos
 AQ	-7750+16636	Pacific/Auckland	New Zealand time - McMurdo, South Pole
 AQ	-6617+11031	Antarctica/Casey	Casey
 AQ	-6835+07758	Antarctica/Davis	Davis
-AQ	-6640+14001	Etc/GMT-10	Dumont-d'Urville
+AQ	-6640+14001	Pacific/Port_Moresby	Dumont-d'Urville
 AQ	-6736+06253	Antarctica/Mawson	Mawson
 AQ	-6448-06406	Antarctica/Palmer	Palmer
 AQ	-6734-06808	Antarctica/Rothera	Rothera
-AQ	-690022+0393524	Etc/GMT-3	Syowa
+AQ	-690022+0393524	Asia/Riyadh	Syowa
 AQ	-720041+0023206	Antarctica/Troll	Troll
-AQ	-7824+10654	Etc/GMT-6	Vostok
+AQ	-7824+10654	Asia/Urumqi	Vostok
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
 AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
 AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
@@ -77,15 +77,15 @@ BA	+4352+01825	Europe/Belgrade
 BB	+1306-05937	America/Barbados
 BD	+2343+09025	Asia/Dhaka
 BE	+5050+00420	Europe/Brussels
-BF	+1222-00131	Etc/GMT
+BF	+1222-00131	Africa/Abidjan
 BG	+4241+02319	Europe/Sofia
 BH	+2623+05035	Asia/Qatar
 BI	-0323+02922	Africa/Maputo
 BJ	+0629+00237	Africa/Lagos
 BL	+1753-06251	America/Puerto_Rico
 BM	+3217-06446	Atlantic/Bermuda
-BN	+0456+11455	Etc/GMT-8
-BO	-1630-06809	Etc/GMT+4
+BN	+0456+11455	Asia/Kuching
+BO	-1630-06809	America/La_Paz
 BQ	+120903-0681636	America/Puerto_Rico
 BR	-0351-03225	America/Noronha	Atlantic islands
 BR	-0127-04829	America/Belem	Para (east); Amapa
@@ -142,20 +142,20 @@ CD	-1140+02728	Africa/Maputo	Dem. Rep. of Congo (east)
 CF	+0422+01835	Africa/Lagos
 CG	-0416+01517	Africa/Lagos
 CH	+4723+00832	Europe/Zurich
-CI	+0519-00402	Etc/GMT
+CI	+0519-00402	Africa/Abidjan
 CK	-2114-15946	Pacific/Rarotonga
 CL	-3327-07040	America/Santiago	Chile (most areas)
 CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
 CL	-2709-10926	Pacific/Easter	Easter Island
 CM	+0403+00942	Africa/Lagos
 CN	+3114+12128	Asia/Shanghai	Beijing Time
-CN	+4348+08735	Etc/GMT-6	Xinjiang Time
+CN	+4348+08735	Asia/Urumqi	Xinjiang Time
 CO	+0436-07405	America/Bogota
 CR	+0956-08405	America/Costa_Rica
 CU	+2308-08222	America/Havana
 CV	+1455-02331	Atlantic/Cape_Verde
 CW	+1211-06900	America/Puerto_Rico
-CX	-1025+10543	Etc/GMT-7
+CX	-1025+10543	Asia/Bangkok
 CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
 CY	+3507+03357	Asia/Famagusta	Northern Cyprus
 CZ	+5005+01426	Europe/Prague
@@ -179,8 +179,8 @@ ET	+0902+03842	Africa/Nairobi
 FI	+6010+02458	Europe/Helsinki
 FJ	-1808+17825	Pacific/Fiji
 FK	-5142-05751	Atlantic/Stanley
-FM	+0725+15147	Etc/GMT-10	Chuuk/Truk, Yap
-FM	+0658+15813	Etc/GMT-11	Pohnpei/Ponape
+FM	+0725+15147	Pacific/Port_Moresby	Chuuk/Truk, Yap
+FM	+0658+15813	Pacific/Guadalcanal	Pohnpei/Ponape
 FM	+0519+16259	Pacific/Kosrae	Kosrae
 FO	+6201-00646	Atlantic/Faroe
 FR	+4852+00220	Europe/Paris
@@ -188,20 +188,20 @@ GA	+0023+00927	Africa/Lagos
 GB	+513030-0000731	Europe/London
 GD	+1203-06145	America/Puerto_Rico
 GE	+4143+04449	Asia/Tbilisi
-GF	+0456-05220	Etc/GMT+3
+GF	+0456-05220	America/Cayenne
 GG	+492717-0023210	Europe/London
-GH	+0533-00013	Etc/GMT
+GH	+0533-00013	Africa/Abidjan
 GI	+3608-00521	Europe/Gibraltar
 GL	+6411-05144	America/Nuuk	Greenland (most areas)
 GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
 GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
 GL	+7634-06847	America/Thule	Thule/Pituffik
-GM	+1328-01639	Etc/GMT
-GN	+0931-01343	Etc/GMT
+GM	+1328-01639	Africa/Abidjan
+GN	+0931-01343	Africa/Abidjan
 GP	+1614-06132	America/Puerto_Rico
 GQ	+0345+00847	Africa/Lagos
 GR	+3758+02343	Europe/Athens
-GS	-5416-03632	Etc/GMT+2
+GS	-5416-03632	Atlantic/South_Georgia
 GT	+1438-09031	America/Guatemala
 GU	+1328+14445	Pacific/Guam
 GW	+1151-01535	Africa/Bissau
@@ -222,7 +222,7 @@ IN	+2232+08822	Asia/Kolkata
 IO	-0720+07225	Indian/Chagos
 IQ	+3321+04425	Asia/Baghdad
 IR	+3540+05126	Asia/Tehran
-IS	+6409-02151	Etc/GMT
+IS	+6409-02151	Africa/Abidjan
 IT	+4154+01229	Europe/Rome
 JE	+491101-0020624	Europe/London
 JM	+175805-0764736	America/Jamaica
@@ -230,15 +230,15 @@ JO	+3157+03556	Asia/Amman
 JP	+353916+1394441	Asia/Tokyo
 KE	-0117+03649	Africa/Nairobi
 KG	+4254+07436	Asia/Bishkek
-KH	+1133+10455	Etc/GMT-7
-KI	+0125+17300	Etc/GMT-12	Gilbert Islands
+KH	+1133+10455	Asia/Bangkok
+KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
 KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
 KI	+0152-15720	Pacific/Kiritimati	Line Islands
 KM	-1141+04316	Africa/Nairobi
 KN	+1718-06243	America/Puerto_Rico
 KP	+3901+12545	Asia/Pyongyang
 KR	+3733+12658	Asia/Seoul
-KW	+2920+04759	Etc/GMT-3
+KW	+2920+04759	Asia/Riyadh
 KY	+1918-08123	America/Panama
 KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
 KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
@@ -247,7 +247,7 @@ KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
 KZ	+4431+05016	Asia/Aqtau	Mangghystau/Mankistau
 KZ	+4707+05156	Asia/Atyrau	Atyrau/Atirau/Gur'yev
 KZ	+5113+05121	Asia/Oral	West Kazakhstan
-LA	+1758+10236	Etc/GMT-7
+LA	+1758+10236	Asia/Bangkok
 LB	+3353+03530	Asia/Beirut
 LC	+1401-06100	America/Puerto_Rico
 LI	+4709+00931	Europe/Zurich
@@ -264,10 +264,10 @@ MD	+4700+02850	Europe/Chisinau
 ME	+4226+01916	Europe/Belgrade
 MF	+1804-06305	America/Puerto_Rico
 MG	-1855+04731	Africa/Nairobi
-MH	+0709+17112	Etc/GMT-12	Marshall Islands (most areas)
+MH	+0709+17112	Pacific/Tarawa	Marshall Islands (most areas)
 MH	+0905+16720	Pacific/Kwajalein	Kwajalein
 MK	+4159+02126	Europe/Belgrade
-ML	+1239-00800	Etc/GMT
+ML	+1239-00800	Africa/Abidjan
 MM	+1647+09610	Asia/Yangon
 MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
 MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
@@ -275,11 +275,11 @@ MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
 MO	+221150+1133230	Asia/Macau
 MP	+1512+14545	Pacific/Guam
 MQ	+1436-06105	America/Martinique
-MR	+1806-01557	Etc/GMT
+MR	+1806-01557	Africa/Abidjan
 MS	+1643-06213	America/Puerto_Rico
 MT	+3554+01431	Europe/Malta
 MU	-2010+05730	Indian/Mauritius
-MV	+0410+07330	Etc/GMT-5
+MV	+0410+07330	Indian/Maldives
 MW	-1547+03500	Africa/Maputo
 MX	+1924-09909	America/Mexico_City	Central Time
 MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
@@ -293,7 +293,7 @@ MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
 MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
 MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahia de Banderas
 MY	+0310+10142	Asia/Singapore	Malaysia (peninsula)
-MY	+0133+11020	Etc/GMT-8	Sabah, Sarawak
+MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
 MZ	-2558+03235	Africa/Maputo
 NA	-2234+01706	Africa/Windhoek
 NC	-2216+16627	Pacific/Noumea
@@ -308,13 +308,13 @@ NR	-0031+16655	Pacific/Nauru
 NU	-1901-16955	Pacific/Niue
 NZ	-3652+17446	Pacific/Auckland	New Zealand (most areas)
 NZ	-4357-17633	Pacific/Chatham	Chatham Islands
-OM	+2336+05835	Etc/GMT-4
+OM	+2336+05835	Asia/Dubai
 PA	+0858-07932	America/Panama
 PE	-1203-07703	America/Lima
-PF	-1732-14934	Etc/GMT+10	Society Islands
+PF	-1732-14934	Pacific/Tahiti	Society Islands
 PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
-PF	-2308-13457	Etc/GMT+9	Gambier Islands
-PG	-0930+14710	Etc/GMT-10	Papua New Guinea (most areas)
+PF	-2308-13457	Pacific/Gambier	Gambier Islands
+PG	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas)
 PG	-0613+15534	Pacific/Bougainville	Bougainville
 PH	+1435+12100	Asia/Manila
 PK	+2452+06703	Asia/Karachi
@@ -327,10 +327,10 @@ PS	+313200+0350542	Asia/Hebron	West Bank
 PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
 PT	+3238-01654	Atlantic/Madeira	Madeira Islands
 PT	+3744-02540	Atlantic/Azores	Azores
-PW	+0720+13429	Etc/GMT-9
+PW	+0720+13429	Pacific/Palau
 PY	-2516-05740	America/Asuncion
 QA	+2517+05132	Asia/Qatar
-RE	-2052+05528	Etc/GMT-4
+RE	-2052+05528	Asia/Dubai
 RO	+4426+02606	Europe/Bucharest
 RS	+4450+02030	Europe/Belgrade
 RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
@@ -364,19 +364,19 @@ RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
 RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
 RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
 RW	-0157+03004	Africa/Maputo
-SA	+2438+04643	Etc/GMT-3
-SB	-0932+16012	Etc/GMT-11
-SC	-0440+05528	Etc/GMT-4
+SA	+2438+04643	Asia/Riyadh
+SB	-0932+16012	Pacific/Guadalcanal
+SC	-0440+05528	Asia/Dubai
 SD	+1536+03232	Africa/Khartoum
 SE	+5920+01803	Europe/Berlin
 SG	+0117+10351	Asia/Singapore
-SH	-1555-00542	Etc/GMT
+SH	-1555-00542	Africa/Abidjan
 SI	+4603+01431	Europe/Belgrade
 SJ	+7800+01600	Europe/Berlin
 SK	+4809+01707	Europe/Prague
-SL	+0830-01315	Etc/GMT
+SL	+0830-01315	Africa/Abidjan
 SM	+4355+01228	Europe/Rome
-SN	+1440-01726	Etc/GMT
+SN	+1440-01726	Africa/Abidjan
 SO	+0204+04522	Africa/Nairobi
 SR	+0550-05510	America/Paramaribo
 SS	+0451+03137	Africa/Juba
@@ -387,9 +387,9 @@ SY	+3330+03618	Asia/Damascus
 SZ	-2618+03106	Africa/Johannesburg
 TC	+2128-07108	America/Grand_Turk
 TD	+1207+01503	Africa/Ndjamena
-TF	-492110+0701303	Etc/GMT-5
-TG	+0608+00113	Etc/GMT
-TH	+1345+10031	Etc/GMT-7
+TF	-492110+0701303	Indian/Maldives
+TG	+0608+00113	Africa/Abidjan
+TH	+1345+10031	Asia/Bangkok
 TJ	+3835+06848	Asia/Dushanbe
 TK	-0922-17114	Pacific/Fakaofo
 TL	-0833+12535	Asia/Dili
@@ -398,7 +398,7 @@ TN	+3648+01011	Africa/Tunis
 TO	-210800-1751200	Pacific/Tongatapu
 TR	+4101+02858	Europe/Istanbul
 TT	+1039-06131	America/Puerto_Rico
-TV	-0831+17913	Etc/GMT-12
+TV	-0831+17913	Pacific/Tarawa
 TW	+2503+12130	Asia/Taipei
 TZ	-0648+03917	Africa/Nairobi
 UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
@@ -406,7 +406,7 @@ UA	+4837+02218	Europe/Uzhgorod	Transcarpathia
 UA	+4750+03510	Europe/Zaporozhye	Zaporozhye and east Lugansk
 UG	+0019+03225	Africa/Nairobi
 UM	+2813-17722	Pacific/Pago_Pago	Midway Islands
-UM	+1917+16637	Etc/GMT-12	Wake Island
+UM	+1917+16637	Pacific/Tarawa	Wake Island
 US	+404251-0740023	America/New_York	Eastern (most areas)
 US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
 US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
@@ -444,12 +444,12 @@ VC	+1309-06114	America/Puerto_Rico
 VE	+1030-06656	America/Caracas
 VG	+1827-06437	America/Puerto_Rico
 VI	+1821-06456	America/Puerto_Rico
-VN	+2102+10551	Etc/GMT-7	Vietnam (north)
+VN	+2102+10551	Asia/Bangkok	Vietnam (north)
 VN	+1045+10640	Asia/Ho_Chi_Minh	Vietnam (south)
 VU	-1740+16825	Pacific/Efate
-WF	-1318-17610	Etc/GMT-12
+WF	-1318-17610	Pacific/Tarawa
 WS	-1350-17144	Pacific/Apia
-YE	+1245+04512	Etc/GMT-3
+YE	+1245+04512	Asia/Riyadh
 YT	-1247+04514	Africa/Nairobi
 ZA	-2615+02800	Africa/Johannesburg
 ZM	-1525+02817	Africa/Maputo

zone1970.tab

@@ -34,7 +34,7 @@
 #country-
 #codes	coordinates	TZ	comments
 AD	+4230+00131	Europe/Andorra
-AE,OM,RE,SC,TF	+2518+05518	Etc/GMT-4	UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is
+AE,OM,RE,SC,TF	+2518+05518	Asia/Dubai	UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is
 AF	+3431+06912	Asia/Kabul
 AL	+4120+01950	Europe/Tirane
 AM	+4011+04430	Asia/Yerevan
@@ -44,8 +44,6 @@ AQ	-6736+06253	Antarctica/Mawson	Mawson
 AQ	-6448-06406	Antarctica/Palmer	Palmer
 AQ	-6734-06808	Antarctica/Rothera	Rothera
 AQ	-720041+0023206	Antarctica/Troll	Troll
-AQ,KW,SA,YE	+2438+04643	Etc/GMT-3	Arabia, Syowa
-AQ,FM,PG	-0930+14710	Etc/GMT-10	Papua New Guinea (most areas), Chuuk, Yap, Dumont d'Urville
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
 AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
 AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
@@ -76,11 +74,9 @@ AZ	+4023+04951	Asia/Baku
 BB	+1306-05937	America/Barbados
 BD	+2343+09025	Asia/Dhaka
 BE,LU,NL	+5050+00420	Europe/Brussels
-BF,CI,GH,GM,GN,IS,ML,MR,SH,SL,SN,TG	+0519-00402	Etc/GMT
 BG	+4241+02319	Europe/Sofia
 BM	+3217-06446	Atlantic/Bermuda
-BN,MY	+0133+11020	Etc/GMT-8	Sabah, Sarawak, Brunei
-BO	-1630-06809	Etc/GMT+4
+BO	-1630-06809	America/La_Paz
 BR	-0351-03225	America/Noronha	Atlantic islands
 BR	-0127-04829	America/Belem	Pará (east); Amapá
 BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
@@ -126,17 +122,17 @@ CA	+6043-13503	America/Whitehorse	MST - Yukon (east)
 CA	+6404-13925	America/Dawson	MST - Yukon (west)
 CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
 CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
+CI,BF,GH,GM,GN,IS,ML,MR,SH,SL,SN,TG	+0519-00402	Africa/Abidjan
 CK	-2114-15946	Pacific/Rarotonga
 CL	-3327-07040	America/Santiago	Chile (most areas)
 CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
 CL	-2709-10926	Pacific/Easter	Easter Island
 CN	+3114+12128	Asia/Shanghai	Beijing Time
-CN,AQ	+4348+08735	Etc/GMT-6	Xinjiang Time, Vostok
+CN,AQ	+4348+08735	Asia/Urumqi	Xinjiang Time, Vostok
 CO	+0436-07405	America/Bogota
 CR	+0956-08405	America/Costa_Rica
 CU	+2308-08222	America/Havana
 CV	+1455-02331	Atlantic/Cape_Verde
-CX,KH,LA,TH,VN	+1345+10031	Etc/GMT-7	Indochina (most areas)
 CY	+3510+03322	Asia/Nicosia	Cyprus (most areas)
 CY	+3507+03357	Asia/Famagusta	Northern Cyprus
 CZ,SK	+5005+01426	Europe/Prague
@@ -159,14 +155,14 @@ FO	+6201-00646	Atlantic/Faroe
 FR,MC	+4852+00220	Europe/Paris
 GB,GG,IM,JE	+513030-0000731	Europe/London
 GE	+4143+04449	Asia/Tbilisi
-GF	+0456-05220	Etc/GMT+3
+GF	+0456-05220	America/Cayenne
 GI	+3608-00521	Europe/Gibraltar
 GL	+6411-05144	America/Nuuk	Greenland (most areas)
 GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
 GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
 GL	+7634-06847	America/Thule	Thule/Pituffik
 GR	+3758+02343	Europe/Athens
-GS	-5416-03632	Etc/GMT+2
+GS	-5416-03632	Atlantic/South_Georgia
 GT	+1438-09031	America/Guatemala
 GU,MP	+1328+14445	Pacific/Guam
 GW	+1151-01535	Africa/Bissau
@@ -191,9 +187,9 @@ JO	+3157+03556	Asia/Amman
 JP	+353916+1394441	Asia/Tokyo
 KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT	-0117+03649	Africa/Nairobi
 KG	+4254+07436	Asia/Bishkek
+KI,MH,TV,UM,WF	+0125+17300	Pacific/Tarawa	Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake
 KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
 KI	+0152-15720	Pacific/Kiritimati	Line Islands
-KI,MH,TV,UM,WF	+0125+17300	Etc/GMT-12	Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake
 KP	+3901+12545	Asia/Pyongyang
 KR	+3733+12658	Asia/Seoul
 KZ	+4315+07657	Asia/Almaty	Kazakhstan (most areas)
@@ -220,7 +216,7 @@ MO	+221150+1133230	Asia/Macau
 MQ	+1436-06105	America/Martinique
 MT	+3554+01431	Europe/Malta
 MU	-2010+05730	Indian/Mauritius
-MV,TF	+0410+07330	Etc/GMT-5	Maldives, Kerguelen, St Paul I, Amsterdam I
+MV,TF	+0410+07330	Indian/Maldives	Maldives, Kerguelen, St Paul I, Amsterdam I
 MX	+1924-09909	America/Mexico_City	Central Time
 MX	+2105-08646	America/Cancun	Eastern Standard Time - Quintana Roo
 MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatán
@@ -232,6 +228,7 @@ MX	+2934-10425	America/Ojinaga	Mountain Time US - Chihuahua (US border)
 MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
 MX	+3232-11701	America/Tijuana	Pacific Time US - Baja California
 MX	+2048-10515	America/Bahia_Banderas	Central Time - Bahía de Banderas
+MY,BN	+0133+11020	Asia/Kuching	Sabah, Sarawak, Brunei
 MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time
 NA	-2234+01706	Africa/Windhoek
 NC	-2216+16627	Pacific/Noumea
@@ -245,9 +242,10 @@ NZ,AQ	-3652+17446	Pacific/Auckland	New Zealand time
 NZ	-4357-17633	Pacific/Chatham	Chatham Islands
 PA,CA,KY	+0858-07932	America/Panama	EST - Panama, Cayman, ON (Atikokan), NU (Coral H)
 PE	-1203-07703	America/Lima
-PF	-1732-14934	Etc/GMT+10	Society Islands
+PF	-1732-14934	Pacific/Tahiti	Society Islands
 PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
-PF	-2308-13457	Etc/GMT+9	Gambier Islands
+PF	-2308-13457	Pacific/Gambier	Gambier Islands
+PG,AQ,FM	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas), Chuuk, Yap, Dumont d'Urville
 PG	-0613+15534	Pacific/Bougainville	Bougainville
 PH	+1435+12100	Asia/Manila
 PK	+2452+06703	Asia/Karachi
@@ -260,7 +258,7 @@ PS	+313200+0350542	Asia/Hebron	West Bank
 PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
 PT	+3238-01654	Atlantic/Madeira	Madeira Islands
 PT	+3744-02540	Atlantic/Azores	Azores
-PW	+0720+13429	Etc/GMT-9
+PW	+0720+13429	Pacific/Palau
 PY	-2516-05740	America/Asuncion
 QA,BH	+2517+05132	Asia/Qatar
 RO	+4426+02606	Europe/Bucharest
@@ -293,7 +291,8 @@ RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
 RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); North Kuril Is
 RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
 RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
-SB,FM	-0932+16012	Etc/GMT-11	Solomons, Pohnpei
+SA,AQ,KW,YE	+2438+04643	Asia/Riyadh	Arabia, Syowa
+SB,FM	-0932+16012	Pacific/Guadalcanal	Solomons, Pohnpei
 SD	+1536+03232	Africa/Khartoum
 SG,MY	+0117+10351	Asia/Singapore	Singapore, peninsular Malaysia
 SR	+0550-05510	America/Paramaribo
@@ -303,6 +302,7 @@ SV	+1342-08912	America/El_Salvador
 SY	+3330+03618	Asia/Damascus
 TC	+2128-07108	America/Grand_Turk
 TD	+1207+01503	Africa/Ndjamena
+TH,CX,KH,LA,VN	+1345+10031	Asia/Bangkok	Indochina (most areas)
 TJ	+3835+06848	Asia/Dushanbe
 TK	-0922-17114	Pacific/Fakaofo
 TL	-0833+12535	Asia/Dili