diff options
author | wollman <wollman@FreeBSD.org> | 1997-10-25 18:27:25 +0000 |
---|---|---|
committer | wollman <wollman@FreeBSD.org> | 1997-10-25 18:27:25 +0000 |
commit | d7f6ac99391f568a5efbeee85dd63682eebf4b53 (patch) | |
tree | da92810b2ee6ae753a81c2e1197fa2b114d6323c /share/zoneinfo/southamerica | |
parent | 0a36e4c6fdc2a8533314057e037269a912c2eb5e (diff) | |
download | FreeBSD-src-d7f6ac99391f568a5efbeee85dd63682eebf4b53.zip FreeBSD-src-d7f6ac99391f568a5efbeee85dd63682eebf4b53.tar.gz |
Merge changes from vendor branch.
Diffstat (limited to 'share/zoneinfo/southamerica')
-rw-r--r-- | share/zoneinfo/southamerica | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/share/zoneinfo/southamerica b/share/zoneinfo/southamerica index b2b5138..09e0aa6 100644 --- a/share/zoneinfo/southamerica +++ b/share/zoneinfo/southamerica @@ -1,4 +1,4 @@ -# @(#)southamerica 7.16 +# @(#)southamerica 7.18 # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to @@ -267,10 +267,11 @@ Rule Brazil 1988 1989 - Oct Sun>=10 0:00 1:00 D Rule Brazil 1990 1991 - Feb Sun>=11 0:00 0 S Rule Brazil 1990 1992 - Oct Sun>=20 0:00 1:00 D Rule Brazil 1992 only - Feb 9 0:00 0 S -Rule Brazil 1993 max - Oct Sun>=11 0:00 1:00 D +Rule Brazil 1993 1995 - Oct Sun>=11 0:00 1:00 D Rule Brazil 1993 only - Jan 31 0:00 0 S Rule Brazil 1994 1995 - Feb Sun>=15 0:00 0 S Rule Brazil 1996 max - Feb Sun>=11 0:00 0 S +Rule Brazil 1996 max - Oct Sun>=1 0:00 1:00 D # Zone NAME GMTOFF RULES FORMAT [UNTIL] # @@ -434,9 +435,11 @@ Rule Para 1991 only - Oct 6 0:00 1:00 S Rule Para 1992 only - Mar 1 0:00 0 - Rule Para 1992 only - Oct 5 0:00 1:00 S Rule Para 1993 only - Mar 31 0:00 0 - -Rule Para 1993 max - Oct 1 0:00 1:00 S +Rule Para 1993 1995 - Oct 1 0:00 1:00 S Rule Para 1994 1995 - Feb lastSun 0:00 0 - Rule Para 1996 max - Mar 1 0:00 0 - +Rule Para 1996 only - Oct 6 0:00 1:00 S +Rule Para 1997 max - Oct 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 @@ -530,7 +533,9 @@ Rule Uruguay 1989 only - Mar 12 0:00 0 - Rule Uruguay 1989 only - Oct 29 0:00 1:00 S Rule Uruguay 1990 1992 - Mar Sun>=1 0:00 0 - Rule Uruguay 1990 1991 - Oct Sun>=21 0:00 1:00 S -Rule Uruguay 1992 1993 - Oct Sun>=15 0:00 1:00 S +# Shanks's 4th edition (1995) says no DST was observed in 1990/1 and 1991/2, +# and that 1992/3's DST was from 10-25 to 03-01. Go with IATA. +Rule Uruguay 1992 only - Oct 18 0:00 1:00 S Rule Uruguay 1993 only - Feb 28 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Montevideo -3:44:44 - LMT 1898 Jun 28 |