Merge from vendor branch.

7 files changed, 244 insertions, 64 deletions

diff --git a/share/zoneinfo/africa b/share/zoneinfo/africa
index c9d3cd0..404aacb 100644
--- a/share/zoneinfo/africa
+++ b/share/zoneinfo/africa
@@ -1,4 +1,5 @@
-# @(#)africa	7.33
+# @(#)africa	7.34
+
 # $FreeBSD$
 
 # This data is by no means authoritative; if you think you know better,
@@ -29,7 +30,7 @@
 #
 # Previous editions of this database used WAT, CAT, SAT, and EAT
 # for +0:00 through +3:00, respectively,
-# but Mark R V Murray <markm@iafrica.com> reports that
+# but Mark R V Murray <markm@grondar.za> reports that
 # `SAST' is the official abbreviation for +2:00 in the country of South Africa,
 # `CAT' is commonly used for +2:00 in countries north of South Africa, and
 # `WAT' is probably the best name for +1:00, as the common phrase for
diff --git a/share/zoneinfo/asia b/share/zoneinfo/asia
index 7be3350..495d67a 100644
--- a/share/zoneinfo/asia
+++ b/share/zoneinfo/asia
@@ -1,4 +1,4 @@
-# @(#)asia	7.56
+# @(#)asia	7.57
 
 # $FreeBSD$
 
@@ -112,7 +112,7 @@ Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
 
 # Bahrain
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Bahrain	3:22:20 -	LMT	1920		# Al-Manamah
+Zone	Asia/Bahrain	3:22:20 -	LMT	1920		# Al Manamah
 			4:00	-	GST	1972 Jun
 			3:00	-	AST
 
@@ -128,7 +128,7 @@ Zone	Asia/Dacca	6:01:40 -	LMT	1890
 
 # Bhutan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Thimbu	5:58:36 -	LMT	1947 Aug 15
+Zone	Asia/Thimphu	5:58:36 -	LMT	1947 Aug 15 # or Thimbu
 			5:30	-	IST	1987 Oct
 			6:00	-	BTT	# Bhutan Time
 
@@ -198,7 +198,7 @@ Rule	PRC	1986	only	-	May	 4	0:00	1:00	D
 Rule	PRC	1986	1991	-	Sep	Sun>=11	0:00	0	S
 Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Harbin	8:26:44	-	LMT	1928
+Zone	Asia/Harbin	8:26:44	-	LMT	1928 # or Haerbin
 			8:30	-	HART	1932 Mar # Harbin Time
 			8:00	-	CST	1940
 			9:00	-	HART	1966 May
@@ -207,17 +207,17 @@ Zone	Asia/Harbin	8:26:44	-	LMT	1928
 Zone	Asia/Shanghai	8:05:52	-	LMT	1928
 			8:00	Shang	C%sT	1949
 			8:00	PRC	C%sT
-Zone	Asia/Chungking	7:06:20	-	LMT	1928
+Zone	Asia/Chungking	7:06:20	-	LMT	1928 # or Chongqing
 			7:00	-	CHUT	1980 May # Chungking Time
 			8:00	PRC	C%sT
-Zone	Asia/Urumqi	5:50:20	-	LMT	1928
+Zone	Asia/Urumqi	5:50:20	-	LMT	1928 # or Urumchi
 			6:00	-	URUT	1980 May # Urumqi Time
 			8:00	PRC	C%sT
-Zone	Asia/Kashgar	5:03:56	-	LMT	1928
+Zone	Asia/Kashgar	5:03:56	-	LMT	1928 # or Kashi or Kaxgar
 			5:30	-	KAST	1940	 # Kashgar Time
 			5:00	-	KAST	1980 May
 			8:00	PRC	C%sT
-# Hong Kong
+# Hong Kong (Xianggang)
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	HK	1946	only	-	Apr	20	3:30	1:00	S
 Rule	HK	1946	only	-	Dec	1	3:30	0	-
@@ -263,7 +263,7 @@ Rule	Taiwan	1980	only	-	Sep	30	0:00	0	S
 Zone	Asia/Taipei	8:06:00 -	LMT	1896
 			8:00	Taiwan	C%sT
 
-# Macao
+# Macao (Macau, Aomen)
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Macao	1961	1962	-	Mar	Sun>=16	3:30	1:00	S
 Rule	Macao	1961	1964	-	Nov	Sun>=1	3:30	0	-
@@ -304,6 +304,10 @@ Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
 			2:00	EUAsia	EE%sT
 # IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
 
+# 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
+
 # Georgia
 # From Paul Eggert <eggert@twinsun.com> (1994-11-19):
 # Today's _Economist_ (p 60) reports that Georgia moved its clocks forward
@@ -485,7 +489,7 @@ Rule	Iraq	1986	1990	-	Mar	lastSun	1:00s	1:00	D
 # IATA SSIM (1991/1996) says Apr 1 12:01am UTC; guess the `:01' is a typo.
 # Shanks says Iraq did not observe DST 1992/1997 or 1999 on; ignore this.
 Rule	Iraq	1991	max	-	Apr	 1	3:00s	1:00	D
-Rule	Iraq	1991	max	-	Oct	 1	3:00s	0	D
+Rule	Iraq	1991	max	-	Oct	 1	3:00s	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baghdad	2:57:40	-	LMT	1890
 			2:57:36	-	BMT	1918	    # Baghdad Mean Time?
@@ -776,7 +780,7 @@ Zone	Asia/Aqtau	3:21:04	-	LMT	1924 May  2 # or Aktau
 			5:00 E-EurAsia	AQT%sT	1995 Sep lastSun
 			4:00 E-EurAsia	AQT%sT
 
-# Kirgizstan
+# Kyrgyzstan (Kirgizstan)
 # Transitions through 1991 are from Shanks.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Kirgiz	1992	1996	-	Apr	Sun>=7	0:00	1:00	S
@@ -832,7 +836,7 @@ Zone	Asia/Kuwait	3:11:56 -	LMT	1950
 
 # Laos
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jun  9
+Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jun  9 # or Viangchan
 			7:06:20	-	SMT	1911 Mar 11 0:01 # Saigon MT?
 			7:00	-	ICT	1912 May
 			8:00	-	ICT	1931 May
@@ -1088,7 +1092,7 @@ Zone	Asia/Manila	-15:56:00 -	LMT	1844
 
 # Qatar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Qatar	3:26:08 -	LMT	1920		# Al Dawhah
+Zone	Asia/Qatar	3:26:08 -	LMT	1920	# Al Dawhah / Doha
 			4:00	-	GST	1972 Jun
 			3:00	-	AST
 
@@ -1177,7 +1181,7 @@ Rule	Syria	1994	max	-	Oct	 1	0:00	0	-
 Rule	Syria	1997	1998	-	Mar	lastMon	0:00	1:00	S
 Rule	Syria	1999	max	-	Apr	 1	0:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Damascus	2:25:12 -	LMT	1920
+Zone	Asia/Damascus	2:25:12 -	LMT	1920	# Dimashq
 			2:00	Syria	EE%sT
 
 # Tajikistan
@@ -1198,7 +1202,7 @@ Zone	Asia/Bangkok	6:42:04	-	LMT	1880
 # Turkmenistan
 # From Shanks.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Ashkhabad	3:53:32 -	LMT	1924 May  2 # or Ashgabat
+Zone	Asia/Ashgabat	3:53:32 -	LMT	1924 May  2 # or Ashkhabad
 			4:00	-	ASHT	1930 Jun 21 # Ashkhabad Time
 			5:00 RussiaAsia	ASH%sT	1991 Mar 31 2:00
 			4:00 RussiaAsia	ASH%sT	1991 Oct 27 # independence
diff --git a/share/zoneinfo/australasia b/share/zoneinfo/australasia
index d5df828..3e79b6b 100644
--- a/share/zoneinfo/australasia
+++ b/share/zoneinfo/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia	7.58
+# @(#)australasia	7.60
 # This file also includes Pacific islands.
 # $FreeBSD$
 # Notes are at the end of this file
@@ -153,14 +153,14 @@ Zone Australia/Broken_Hill 9:25:48 -	LMT	1895 Feb
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	LH	1981	1984	-	Oct	lastSun	2:00s	1:00	-
 Rule	LH	1982	1985	-	Mar	Sun>=1	2:00s	0	-
-Rule	LH	1985	only	-	Oct	lastSun	2:00s	0:30	-
-Rule	LH	1986	1989	-	Mar	Sun>=15	2:00s	0	-
-Rule	LH	1986	only	-	Oct	19	2:00s	0:30	-
-Rule	LH	1987	1999	-	Oct	lastSun	2:00s	0:30	-
-Rule	LH	1990	1995	-	Mar	Sun>=1	2:00s	0	-
-Rule	LH	1996	max	-	Mar	lastSun	2:00s	0	-
-Rule	LH	2000	only	-	Aug	lastSun	2:00s	0:30	-
-Rule	LH	2001	max	-	Oct	lastSun	2:00s	0:30	-
+Rule	LH	1985	only	-	Oct	lastSun	2:30s	0:30	-
+Rule	LH	1986	1989	-	Mar	Sun>=15	2:30s	0	-
+Rule	LH	1986	only	-	Oct	19	2:30s	0:30	-
+Rule	LH	1987	1999	-	Oct	lastSun	2:30s	0:30	-
+Rule	LH	1990	1995	-	Mar	Sun>=1	2:30s	0	-
+Rule	LH	1996	max	-	Mar	lastSun	2:30s	0	-
+Rule	LH	2000	only	-	Aug	lastSun	2:30s	0:30	-
+Rule	LH	2001	max	-	Oct	lastSun	2:30s	0:30	-
 Zone Australia/Lord_Howe 10:36:20 -	LMT	1895 Feb
 			10:00	-	EST	1981 Mar
 			10:30	LH	LHST
@@ -823,9 +823,14 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Capital Territory, New South Wales except Lord Howe Island and Broken
 # Hill, and Victoria will be August 27, presumably due to the Sydney Olympics.
 
+# From Eric Ulevik, referring to Sydney's Sun Herald (2000-08-13), page 29:
+# Twin Towns Services Club (in Tweed Heads, near the Queensland border)
+# will maintain Queensland time. The Queensland Premier Peter Beattie
+# is encouraging northern NSW towns to use Queensland time.
+
 # Yancowinna
 
-# From John Basser (1989-01-04):
+# From John Mackin (1989-01-04):
 # `Broken Hill' means the County of Yancowinna.
 
 # From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
@@ -863,8 +868,17 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # arrangements.  The starting date for summer time on the Island will
 # however always coincide with the rest of NSW.
 
-# From Paul Eggert (2000-01-31):
-# For Lord Howe we use Shanks through 1989, and Lonergan thereafter.
+# From Jesper Norgaard <jnorgard@Prodigy.net.mx> (2000-09-04):
+# James Lonergan said that the island always tries to stay in sync
+# with the rest of NSW at all time except for the fact that they stay
+# ahead half an hour when DST is not observed. If this is interpreted
+# literally, they should change clocks at the exact moment that
+# e.g. Canberra changes from normal to daylight saving and vice versa.
+
+# From Paul Eggert (2000-10-02):
+# For Lord Howe we use Shanks through 1989, and Lonergan thereafter,
+# However, as per Norgaard we modify Shanks by assuming 02:30s switchover
+# for half-hour DST.
 
 ###############################################################################
 
diff --git a/share/zoneinfo/europe b/share/zoneinfo/europe
index babbd6b..ca2c463 100644
--- a/share/zoneinfo/europe
+++ b/share/zoneinfo/europe
@@ -1,4 +1,4 @@
-# @(#)europe	7.73
+# @(#)europe	7.74
 
 # $FreeBSD$
 
@@ -166,7 +166,26 @@
 # main SHAEF archives held in the US National Archives, SHAEF/5252/8/516)
 # agree that the usage is BDST (this appears in a message dated 17 Feb 1945).
 
-# Howse writes (p 157) `DBST'; let's assume this is a typo.
+# From Joseph S. Meyers (2000-08-10):
+# On 18th April 1941, Sir Stephen Tallents of the BBC wrote to Sir
+# Alexander Maxwell of the Home Office asking whether there was any
+# official designation; the reply of the 21st was that there wasn't
+# but he couldn't think of anything better than the "Double British
+# Summer Time" that the BBC had been using informally.
+# I've put a copy of the Home Office letter at
+# http://student.cusu.cam.ac.uk/~jsm28/british-time/ho-19410421.png
+# and the BBC letter may follow if I get permission from the BBC.
+
+# From Sir Alexander Maxwell in the above-mentioned letter (1941-04-21):
+# [N]o official designation has as far as I know been adopted for the time
+# which is to be introduced in May....
+# I cannot think of anything better than "Double British Summer Time"
+# which could not be said to run counter to any official description.
+
+# From Paul Eggert (2000-10-02):
+# Howse writes (p 157) `DBST' too, but `BDST' seems to have been common
+# and follows the more usual convention of putting the location name first,
+# so we use `BDST'.
 
 # Peter Ilieve <peter@aldie.co.uk> (1998-04-19) described at length
 # the history of summer time legislation in the United Kingdom.
@@ -707,14 +726,14 @@ Rule	Thule	1993	max	-	Apr	Sun>=1	2:00	1:00	D
 Rule	Thule	1993	max	-	Oct	lastSun	2:00	0	S
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Scoresbysund -1:29:00 -	LMT	1916 Jul 28 # Ittoqqortoormit
+Zone America/Scoresbysund -1:29:00 -	LMT	1916 Jul 28 # Ittoqqortoormiit
 			-2:00	-	CGT	1980 Apr  6 2:00
 			-2:00	C-Eur	CG%sT	1981 Mar 29
 			-1:00	EU	EG%sT
 Zone America/Godthab	-3:26:56 -	LMT	1916 Jul 28 # Nuuk
 			-3:00	-	WGT	1980 Apr  6 2:00
 			-3:00	EU	WG%sT
-Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik
+Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik air base
 			-4:00	Thule	A%sT
 
 # Estonia
diff --git a/share/zoneinfo/northamerica b/share/zoneinfo/northamerica
index a79dab9..383f53b 100644
--- a/share/zoneinfo/northamerica
+++ b/share/zoneinfo/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica	7.52
+# @(#)northamerica	7.53
 # also includes Central America and the Caribbean
 
 # $FreeBSD$
@@ -60,10 +60,36 @@
 # Before the Uniform Time Act of 1966 took effect in 1967, observance of
 # Daylight Saving Time in the US was by local option, except during wartime.
 
+# From Arthur David Olson (2000-09-25):
+# Last night I heard part of a rebroadcast of a 1945 Arch Oboler radio drama.
+# In the introduction, Oboler spoke of "Eastern Peace Time."
+# An AltaVista search turned up
+# <a href="http://rowayton.org/rhs/hstaug45.html">:
+# "When the time is announced over the radio now, it is 'Eastern Peace
+# Time' instead of the old familiar 'Eastern War Time.'  Peace is wonderful."
+# </a> (August 1945) by way of confirmation.
+
+# From Joseph Gallant <notquite@hotmail.com>, citing
+# George H. Douglas, _The Early Days of Radio Broadcasting_ (1987):
+# At 7 P.M. (Eastern War Time) [on 1945-08-14], the networks were set
+# to switch to London for Atlee's address, but the American people
+# never got to hear his speech live. According to one press account,
+# CBS' Bob Trout was first to announce the word of Japan's surrender,
+# but a few seconds later, NBC, ABC and Mutual also flashed the word
+# of surrender, all of whom interrupting the bells of Big Ben in
+# London which were to precede Mr. Atlee's speech.
+
+# From Paul Eggert (2000-10-02):
+# Shanks says that DST was called "War Time" in the US in 1919.
+# In the light of the above, this seems suspect;
+# but we have no better authority yet.
+
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	US	1918	1919	-	Mar	lastSun	2:00	1:00	W # War
 Rule	US	1918	1919	-	Oct	lastSun	2:00	0	S
 Rule	US	1942	only	-	Feb	9	2:00	1:00	W # War
+Rule	US	1945	only	-	Aug	14	23:00u	1:00	P # Peace
 Rule	US	1945	only	-	Sep	30	2:00	0	S
 Rule	US	1967	max	-	Oct	lastSun	2:00	0	S
 Rule	US	1967	1973	-	Apr	lastSun	2:00	1:00	D
@@ -152,6 +178,13 @@ Rule	US	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 # Go with Shanks.
 
 # US Eastern time, represented by New York
+
+# Connecticut, Delaware, District of Columbia, most of Florida,
+# Georgia, far southeastern Indiana, eastern Kentucky, Maine,
+# Maryland, Massachusetts, New Hampshire, New Jersey, New York, North
+# Carolina, Ohio, Pennsylvania, Rhode Island, South Carolina, eastern
+# Tennessee, Vermont, Virginia, West Virginia
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
 Rule	NYC	1920	only	-	Mar	lastSun	2:00	1:00	D
 Rule	NYC	1920	only	-	Oct	lastSun	2:00	0	S
@@ -167,6 +200,13 @@ Zone America/New_York	-4:56:02 -	LMT	1883 Nov 18 12:00
 			-5:00	US	E%sT
 
 # US Central time, represented by Chicago
+
+# Alabama, Arkansas, Florida panhandle, Illinois, western Indiana
+# corners, Iowa, most of Kansas, western Kentucky, Louisiana,
+# Minnesota, Mississippi, Missouri, eastern Nebraska, eastern North
+# Dakota, Oklahoma, eastern South Dakota, western Tennessee, most of
+# Texas, Wisconsin
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
 Rule	Chicago	1920	only	-	Jun	13	2:00	1:00	D
 Rule	Chicago	1920	1921	-	Oct	lastSun	2:00	0	S
@@ -185,6 +225,11 @@ Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:00
 			-6:00	US	C%sT
 
 # US Mountain time, represented by Denver
+#
+# Colorado, southern Idaho, far western Kansas, Montana, western
+# Nebraska, New Mexico, southwestern North Dakota, far eastern Oregon,
+# western South Dakota, far western Texas, Utah, Wyoming
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
 Rule	Denver	1920	1921	-	Mar	lastSun	2:00	1:00	D
 Rule	Denver	1920	only	-	Oct	lastSun	2:00	0	S
@@ -200,6 +245,9 @@ Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 12:00
 			-7:00	US	M%sT
 
 # US Pacific time, represented by Los Angeles
+#
+# California, northern Idaho, Nevada, most of Oregon, and Washington
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
 Rule	CA	1948	only	-	Mar	14	2:00	1:00	D
 Rule	CA	1949	only	-	Jan	 1	2:00	0	S
@@ -392,6 +440,7 @@ Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:00
 			-5:00	-	EST
 
 # Part of Kentucky left its clocks alone in 1974.
+# This also includes a part of Indiana immediately adjacent to Louisville.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
 Rule Louisville	1921	only	-	May	1	2:00	1:00	D
 Rule Louisville	1921	only	-	Sep	1	2:00	0	S
@@ -410,16 +459,9 @@ Zone America/Louisville	-5:43:02 -	LMT	1883 Nov 18 12:00
 			-5:00	US	E%sT	1974 Jan  6 2:00
 			-6:00	1:00	CDT	1974 Oct 27 2:00
 			-5:00	US	E%sT
+Link America/Louisville America/Kentucky/Louisville
+#
 # Wayne, Clinton, and Russell Counties, Kentucky
-# From
-# <a href="http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=1999_register&docid=99-26945-filed">
-# Federal Register Doc. 99-26945
-# </a> (1999-10-14 08:45-04)
-# In response to a petition by the Wayne County, Kentucky, Fiscal Court,
-# the Department of Transportation (DOT) proposed to move Wayne County,
-# Kentucky, from the Central Time Zone to the Eastern Time Zone.... Now
-# the earliest date that the proposed change might take effect is
-# October 29, 2000.
 #
 # From
 # <a href="http://www.lake-cumberland.com/life/archive/news990129time.shtml">
@@ -432,6 +474,36 @@ Zone America/Louisville	-5:43:02 -	LMT	1883 Nov 18 12:00
 # August indicated they would like to change to "fast time" also.
 # The three Lake Cumberland counties are the farthest east of any U.S.
 # location in the Central time zone.
+#
+# From Rich Wales (2000-08-29):
+# After prolonged debate, and despite continuing deep differences of opinion,
+# Wayne County (central Kentucky) is switching from Central (-0600) to Eastern
+# (-0500) time.  They won't "fall back" this year.  See:
+# <a href="http://www.nandotimes.com/nation/story/body/0,1037,500244845-500362432-502132762-0,00.html">
+# Sara Shipley, the difference an hour makes (2000-08-29 15:33 -0400)
+# </a>
+Zone America/Kentucky/Monticello -5:39:24 - LMT	1883 Nov 18 12:00
+			-6:00	US	C%sT	1946
+			-6:00	-	CST	1968
+			-6:00	US	C%sT	2000 Oct 29  2:00
+			-5:00	US	E%sT
+
+
+# From Rives McDow (2000-08-30):
+# Here ... are all the changes in the US since 1985.
+# Kearny County, KS (put all of county on central;
+#	previously split between MST and CST) ... 1990-10
+# Starke County, IN (from CST to EST) ... 1991-10
+# Oliver County, ND (from MST to CST) ... 1992-10
+# West Wendover, NV (from PST TO MST) ... 1999-10
+# Wayne County, KY (from CST to EST) ... 2000-10
+# There is another change in the offing; Mercer County, ND is looking
+# to change from MT to CT. It is possible that two other ND counties
+# (Sioux and Morton) will look to change also.  If made, the earliest
+# a change would be effective is October 2001.
+#
+# From Paul Eggert (2000-10-02):
+# FIXME: I haven't yet had time to incorporate all the above changes.
 
 # Michigan
 #
@@ -560,8 +632,20 @@ Link	Pacific/Honolulu	HST
 # From Paul Eggert <eggert@twinsun.com> (1994-11-22):
 # Alas, this sort of thing must be handled by localization software.
 
-# The data for Canada are all from Shanks.
+# Unless otherwise specified, the data for Canada are all from Shanks.
 
+# From Paul Eggert (2000-10-02):
+# H. David Matthews and Mary Vincent's map
+# <a href="http://www.canadiangeographic.ca/SO98/geomap.htm">
+# "It's about TIME", _Canadian Geographic_ (September-October 1998)
+# </a> contains detailed boundaries for regions observing nonstandard
+# time and daylight saving time arrangements in Canada circa 1998.
+#
+# INMS, the Institute for National Measurement Standards in Ottawa, has
+# <a href="http://www.nrc.ca/inms/time/tze.html">
+# information about standard and daylight saving time zones in Canada.
+# </a> (updated periodically).
+# Its unofficial information is often taken from Matthews and Vincent.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Canada	1918	only	-	Apr	14	2:00	1:00	D
@@ -573,7 +657,13 @@ Rule	Canada	1974	max	-	Oct	lastSun	2:00	0	S
 Rule	Canada	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 
 
-# Newfoundland (except Labrador)
+# Newfoundland (and far southeast Labrador)
+
+# From Paul Eggert (2000-10-02):
+# Matthews and Vincent (1998) write that Labrador should use NST/NDT,
+# but the only part of Labrador that follows the rules is the
+# southeast corner, including Port Hope Simpson and Mary's Harbour,
+# but excluding, say, Black Tickle.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	StJohns	1917	1918	-	Apr	Sun>=8	2:00	1:00	D
@@ -603,10 +693,14 @@ Rule	StJohns	1946	1950	-	May	Sun>=8	2:00	1:00	D
 Rule	StJohns	1946	1950	-	Oct	Sun>=2	2:00	0	S
 Rule	StJohns	1951	1986	-	Apr	lastSun	2:00	1:00	D
 Rule	StJohns	1951	1959	-	Sep	lastSun	2:00	0	S
-Rule	StJohns	1960	max	-	Oct	lastSun	2:00	0	S
-Rule	StJohns	1987	only	-	Apr	Sun>=1	2:00	1:00	D
-Rule	StJohns	1988	only	-	Apr	Sun>=1	2:00	2:00	DD
-Rule	StJohns	1989	max	-	Apr	Sun>=1	2:00	1:00	D
+Rule	StJohns	1960	1986	-	Oct	lastSun	2:00	0	S
+# From Paul Eggert (2000-10-02):
+# INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
+# at 00:01 local time.  For now, assume it started in 1987.
+Rule	StJohns	1987	only	-	Apr	Sun>=1	0:01	1:00	D
+Rule	StJohns	1987	max	-	Oct	lastSun	0:01	0	S
+Rule	StJohns	1988	only	-	Apr	Sun>=1	0:01	2:00	DD
+Rule	StJohns	1989	max	-	Apr	Sun>=1	0:01	1:00	D
 # St John's has an apostrophe, but Posix file names can't have apostrophes.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/St_Johns	-3:30:52 -	LMT	1884
@@ -614,7 +708,7 @@ Zone America/St_Johns	-3:30:52 -	LMT	1884
 			-3:30	StJohns	N%sT
 
 
-# east Labrador
+# most of east Labrador
 
 # The name `Happy Valley-Goose Bay' is too long; use `Goose Bay'.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -635,6 +729,11 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	1884 # Happy Valley-Goose Bay
 # Shanks also writes that Liverpool, NS was the only town in Canada to observe
 # DST in 1971 but not 1970; for now we'll assume this is a typo.
 
+# From Paul Eggert (2000-10-02):
+# INMS (2000-09-12) says that, since 1988 at least, New Brunswick switches
+# at 00:01 local time.  FIXME: verify and create a new Zone for this.
+
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Halifax	1916	only	-	Apr	 1	0:00	1:00	D
 Rule Halifax	1916	only	-	Oct	 1	0:00	0	S
@@ -709,6 +808,17 @@ Zone America/Glace_Bay	-3:59:48 -	LMT	1902 Jun 15
 # For what it's worth, Shanks says that Atikokan has agreed with
 # Rainy River ever since standard time was introduced.
 
+# From Paul Eggert (2000-10-02):
+# Matthews and Vincent (1998) write that Atikokan, Pickle Lake, and
+# New Osnaburgh observe CST all year, that Big Trout Lake observes
+# CST/CDT, and that Upsala and Shebandowan observe EST/EDT, all in
+# violation of the official Ontario rules.
+# They also write that Quebec east of the -63 meridian is supposed to
+# observe AST, but residents as far east as Natashquan use EST/EDT,
+# and residents east of Natashquan use AST.
+# We probably need Zones for far east Quebec and for Atikokan,
+# but we don't know when their practices started.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
 Rule	Mont	1917	only	-	Apr	24	0:00	0	S
@@ -776,8 +886,12 @@ Rule	Winn	1960	only	-	Sep	lastSun	2:00	0	S
 Rule	Winn	1963	only	-	Apr	lastSun	2:00	1:00	D
 Rule	Winn	1963	only	-	Sep	22	2:00	0	S
 Rule	Winn	1966	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	Winn	1966	max	-	Oct	lastSun	2:00	0	S
+Rule	Winn	1966	1986	-	Oct	lastSun	2:00	0	S
 Rule	Winn	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+# From Paul Eggert (2000-10-02):
+# INMS (2000-09-12) says that, since 1988 at least, Manitoba switches from
+# DST at 03:00 local time.  For now, assume it started in 1987.
+Rule	Winn	1987	max	-	Oct	lastSun	2:00s	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
 			-6:00	Winn	C%sT
@@ -785,10 +899,12 @@ Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
 
 # Saskatchewan
 
-# From Paul Eggert (1996-06-12):
+# From Paul Eggert (2000-10-02):
 # Shanks writes that since 1970 most of this region has been like Regina.
 # Some western towns (e.g. Swift Current) switched from MST/MDT to CST in 1972.
 # Other western towns (e.g. Lloydminster) are like Edmonton.
+# Matthews and Vincent (1998) write that Denare Beach and Creighton
+# are like Winnipeg, in violation of Saskatchewan law.
 
 # From W. Jones <jones@skdad.usask.ca> (1992-11-06):
 # The. . .below is based on information I got from our law library, the
@@ -876,9 +992,10 @@ Zone America/Edmonton	-7:33:52 -	LMT	1906 Sep
 
 # British Columbia
 
-# From Paul Eggert (1996-06-12):
+# From Paul Eggert (2000-10-02):
 # Shanks writes that since 1970 most of this region has been like Vancouver.
 # Dawson Creek uses MST.  Much of east BC is like Edmonton.
+# Matthews and Vincent (1998) write that Creston is like Dawson Creek.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Vanc	1918	only	-	Apr	14	2:00	1:00	D
@@ -962,6 +1079,18 @@ Zone America/Dawson_Creek -8:00:56 -	LMT	1884
 # for municipal offices and schools....  Igloolik [was similar but then]
 # made the switch to central time on Saturday, Nov. 6.
 
+# From Paul Eggert (2000-10-02):
+# Matthews and Vincent (1998) say the following, but we lack histories
+# for these potential new Zones.
+# 
+# The Canadian Forces station at Alert uses Eastern Time while the
+# handful of residents at the Eureka weather station [in the Central
+# zone] skip daylight savings.  Baffin Island, which is crossed by the
+# Central, Eastern and Atlantic Time zones only uses Eastern Time.
+# Gjoa Haven, Taloyoak and Pelly Bay all use Mountain instead of
+# Central Time and Southampton Island [in the Central zone] is not
+# required to use daylight savings.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	NT_YK	1918	only	-	Apr	14	2:00	1:00	D
 Rule	NT_YK	1918	only	-	Oct	27	2:00	0	S
diff --git a/share/zoneinfo/southamerica b/share/zoneinfo/southamerica
index f5a2f25..4711bc8 100644
--- a/share/zoneinfo/southamerica
+++ b/share/zoneinfo/southamerica
@@ -1,4 +1,4 @@
-# @(#)southamerica	7.36
+# @(#)southamerica	7.37
 
 # $FreeBSD$
 
@@ -118,7 +118,7 @@ Rule	Arg	1999	only	-	Oct	Sun>=1	0:00	1:00	S
 Rule	Arg	2000	only	-	Mar	Sun>=1	0:00	0	-
 #
 # From Peter Gradelski via Steffen Thorsen (2000-03-01):
-# We just checked with our San Paulo office and they say the government of
+# We just checked with our Sao Paulo office and they say the government of
 # Argentina decided not to become one of the countries that go on or off DST.
 # So Buenos Aires should be -3 hours from GMT at all times.
 #
@@ -252,11 +252,15 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # Brazilian official page
 # </a>
 #
-# From Paul Eggert (1998-10-29):
+# From Paul Eggert (2000-10-02):
 # The official decrees referenced below are taken from
 # <a href="http://pcdsh01.on.br/DecHV.html">
 # Decretos sobre o Horario de Verao no Brasil
 # </a> (1999-10-04, in Portuguese).
+# The official site for all decrees, including those not related to time, is
+# <a href="http://www.presidencia.gov.br/CCIVIL/decreto/principal_ano.htm">
+# Presidencia da Republica, Subchefia para Assuntos Juridicos, Decretos
+# </a> (in Portuguese).
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
@@ -366,11 +370,15 @@ Rule	Brazil	1999	only	-	Feb	21	 0:00	0	-
 # Decree <a href="http://pcdsh01.on.br/figuras/HV3150.gif">3,150</a>
 # (1999-08-23) adopted by same states.
 # Decree <a href="http://pcdsh01.on.br/DecHV99.gif">3,188</a> (1999-09-30)
-# adds SE, AL, PE, PR, RN, CE, PI, MA and RR.
+# adds SE, AL, PB, PE, RN, CE, PI, MA and RR.
+Rule	Brazil	1999	only	-	Oct	 3	 0:00	1:00	S
+Rule	Brazil	2000	only	-	Feb	27	 0:00	0	-
+# Decree <a href="http://pcdsh01.on.br/DEC3592.htm">3,592</a> (2000-09-06)
+# adopted by the same states as before.
 # These give only one year's rules.  After that, the rules are guesses
 # and are quite possibly wrong, but are more likely than no DST at all.
-Rule	Brazil	1999	max	-	Oct	Sun>=1	 0:00	1:00	S
-Rule	Brazil	2000	max	-	Feb	lastSun	 0:00	0	-
+Rule	Brazil	2000	max	-	Oct	Sun>=8	 0:00	1:00	S
+Rule	Brazil	2001	max	-	Feb	Sun>=15	 0:00	0	-
 
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -580,7 +588,11 @@ Rule	Para	1996	1998	-	Oct	Sun>=1	0:00	1:00	S
 # go with Shanks.
 Rule	Para	1999	max	-	Feb	lastSun	0:00	0	-
 # IATA SSIM (2000-02) says 1999-10-10.
-Rule	Para	1999	max	-	Oct	Sun>=8	0:00	1:00	S
+Rule	Para	1999	only	-	Oct	10	0:00	1:00	S
+# From Steffen Thorsen (2000-10-02):
+# I have three independent reports that Paraguay changed to DST this Sunday
+# (10-01).
+Rule	Para	2000	max	-	Oct	Sun>=1	0:00	1:00	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Asuncion	-3:50:40 -	LMT	1890
 			-3:50:40 -	AMT	1931 Oct 10 # Asuncion Mean Time
diff --git a/share/zoneinfo/zone.tab b/share/zoneinfo/zone.tab
index 0213811..64618d0 100644
--- a/share/zoneinfo/zone.tab
+++ b/share/zoneinfo/zone.tab
@@ -1,4 +1,4 @@
-# @(#)zone.tab	1.19
+# @(#)zone.tab	1.20
 #
 # $FreeBSD$
 #
@@ -85,7 +85,7 @@ BR	+0249-06040	America/Boa_Vista	Roraima
 BR	-0308-06001	America/Manaus	Amazonas
 BR	-0934-06731	America/Porto_Acre	Acre
 BS	+2505-07721	America/Nassau
-BT	+2728+08939	Asia/Thimbu
+BT	+2728+08939	Asia/Thimphu
 BW	-2545+02555	Africa/Gaborone
 BY	+5354+02734	Europe/Minsk
 BZ	+1730-08812	America/Belize
@@ -334,7 +334,7 @@ TG	+0608+00113	Africa/Lome
 TH	+1345+10031	Asia/Bangkok
 TJ	+3835+06848	Asia/Dushanbe
 TK	-0922-17114	Pacific/Fakaofo
-TM	+3757+05823	Asia/Ashkhabad
+TM	+3757+05823	Asia/Ashgabat
 TN	+3648+01011	Africa/Tunis
 TO	-2110+17510	Pacific/Tongatapu
 TP	-0833+12535	Asia/Dili
@@ -353,7 +353,8 @@ UM	+2813-17722	Pacific/Midway	Midway Islands
 UM	+1917+16637	Pacific/Wake	Wake Island
 US	+404251-0740023	America/New_York	Eastern Time
 US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
-US	+381515-0854534	America/Louisville	Eastern Time - Louisville, Kentucky
+US	+381515-0854534	America/Louisville	Eastern Time - Kentucky - Louisville area
+US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
 US	+394606-0860929	America/Indianapolis	Eastern Standard Time - Indiana - most locations
 US	+382232-0862041	America/Indiana/Marengo	Eastern Standard Time - Indiana - Crawford County
 US	+411745-0863730	America/Indiana/Knox	Eastern Standard Time - Indiana - Starke County