diff options
| author | wollman <wollman@FreeBSD.org> | 1996-12-02 16:59:56 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1996-12-02 16:59:56 +0000 |
| commit | 9e973bfcf48b09eb973427b5ee89ad37bda03559 (patch) | |
| tree | a6d9be7c691e06e31be7758ec65440a7b22903d1 /share/zoneinfo | |
| parent | a0986bce2d93bfb9d39412c9ec85f6caa9d23787 (diff) | |
| parent | 77d4d7f6caed30bc13774eceb82f30d527658c2c (diff) | |
| download | FreeBSD-src-9e973bfcf48b09eb973427b5ee89ad37bda03559.zip FreeBSD-src-9e973bfcf48b09eb973427b5ee89ad37bda03559.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r20091,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'share/zoneinfo')
| -rw-r--r-- | share/zoneinfo/antarctica | 32 | ||||
| -rw-r--r-- | share/zoneinfo/etcetera | 20 |
2 files changed, 42 insertions, 10 deletions
diff --git a/share/zoneinfo/antarctica b/share/zoneinfo/antarctica index 0c78eb6..b4a7d39 100644 --- a/share/zoneinfo/antarctica +++ b/share/zoneinfo/antarctica @@ -1,4 +1,4 @@ -# @(#)antarctica 7.4 +# @(#)antarctica 7.5 # From Paul Eggert (1996-09-03): # To keep things manageable, we list only locations occupied year-round; @@ -8,6 +8,20 @@ # I made up all time zone abbreviations mentioned here; corrections welcome! # FORMAT is `___' and GMTOFF is 0 for locations while uninhabited. +# These rules are stolen from the `southamerica' file. +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule ArgAQ 1964 1966 - Mar 1 0:00 0 - +Rule ArgAQ 1964 1966 - Oct 15 0:00 1:00 S +Rule ArgAQ 1967 only - Apr 1 0:00 0 - +Rule ArgAQ 1967 1968 - Oct Sun<=7 0:00 1:00 S +Rule ArgAQ 1968 1969 - Apr Sun<=7 0:00 0 - +Rule ArgAQ 1974 only - Jan 23 0:00 1:00 S +Rule ArgAQ 1974 only - May 1 0:00 0 - +Rule ArgAQ 1974 1976 - Oct Sun<=7 0:00 1:00 S +Rule ArgAQ 1975 1977 - Apr Sun<=7 0:00 0 - +Rule ChileAQ 1969 max - Oct Sun>=9 0:00 1:00 S +Rule ChileAQ 1970 max - Mar Sun>=9 0:00 0 - + # Argentina - 6 year-round bases # General Belgrano II @@ -118,7 +132,21 @@ Rule NZAQ 1990 max - Mar Sun>=15 2:00s 0 S # USA - year-round bases # -# Palmer, Anvers Island +# Palmer, Anvers Island, since 1965 (moved 2 miles in 1968) +# +# From Ethan Dicks <erd@mcmsun5.mcmurdo.gov> (1996-10-06): +# It keeps the same time as Punta Arenas, Chile, because, just like us +# and the South Pole, that's the other end of their supply line.... +# I verified with someone who was there that since 1980, +# Palmer has followed Chile. Prior to that, before the Falklands War, +# Palmer used to be supplied from Argentina. +# +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Antarctica/Palmer 0 - ___ 1965 + -4:00 ArgAQ AR%sT 1969 Oct 5 + -3:00 ArgAQ AR%sT 1982 May + -4:00 ChileAQ CL%sT +# # # McMurdo, Ross Island, since 1956 # Zone NAME GMTOFF RULES FORMAT [UNTIL] diff --git a/share/zoneinfo/etcetera b/share/zoneinfo/etcetera index 73ad68e..c47fae7 100644 --- a/share/zoneinfo/etcetera +++ b/share/zoneinfo/etcetera @@ -1,15 +1,19 @@ -# @(#)etcetera 7.5 +# @(#)etcetera 7.6 -# All of these are set up just so people can "zic -l" to a timezone -# that's right for their area, even if it doesn't have a name or DST rules -# (half hour zones are too much to bother with -- when someone asks!) +# These entries are mostly present for historical reasons, so that +# people in areas not otherwise covered by the tz files could "zic -l" +# to a time zone that was right for their area. These days, the +# tz files cover almost all the inhabited world, so there's little +# need now for the entries that are not on UTC. Zone Etc/GMT 0 - GMT -Link Etc/GMT Etc/UTC -Link Etc/GMT Etc/UCT -Link Etc/GMT Etc/Universal +Zone Etc/UTC 0 - UTC +Zone Etc/UCT 0 - UCT + +Link Etc/UTC Etc/Universal +Link Etc/UTC Etc/Zulu + Link Etc/GMT Etc/Greenwich -Link Etc/GMT Etc/Zulu Link Etc/GMT Etc/GMT-0 Link Etc/GMT Etc/GMT+0 Link Etc/GMT Etc/GMT0 |
