aboutsummaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
Diffstat (limited to 'time')
-rw-r--r--time/africa81
-rw-r--r--time/europe44
-rw-r--r--time/iso3166.tab4
-rw-r--r--time/northamerica7
-rw-r--r--time/southamerica6
-rw-r--r--time/zone.tab2
6 files changed, 37 insertions, 107 deletions
diff --git a/time/africa b/time/africa
index 2ea89bd5e0..5c9608ceaa 100644
--- a/time/africa
+++ b/time/africa
@@ -1,4 +1,4 @@
-# @(#)africa 7.18
+# @(#)africa 7.19
# 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
@@ -27,85 +27,6 @@
# Derek Howse, Greenwich time and the discovery of the longitude,
# Oxford University Press (1980).
#
-# I added so many Zone names that the old, mostly flat name space was unwieldy.
-# So I renamed the Zones to have the form AREA/LOCATION, where
-# AREA is the name of a continent or ocean, and
-# LOCATION is the name of a specific location within that region.
-# For example, the old zone name `Egypt' is now `Africa/Cairo'.
-#
-# Here are the general rules I used for choosing location names,
-# in decreasing order of importance:
-#
-# Use only valid Posix file names. Use only Ascii letters, digits, `.',
-# `-' and `_'. Do not exceed 14 characters or start with `-'.
-# E.g. prefer `Brunei' to `Bandar_Seri_Begawan'.
-# Include at least one location per time zone rule set per country.
-# One such location is enough.
-# If all the clocks in a country's region have agreed since 1970,
-# don't bother to include more than one location
-# even if subregions' clocks disagreed before 1970.
-# Otherwise these tables would become annoyingly large.
-# If a name is ambiguous, use a less ambiguous alternative;
-# e.g. many cities are named San Jose and Georgetown, so
-# prefer `Costa_Rica' to `San_Jose' and `Guyana' to `Georgetown'.
-# Keep locations compact. Use cities or small islands, not countries
-# or regions, so that any future time zone changes do not split
-# locations into different time zones. E.g. prefer `Paris'
-# to `France', since France has had multiple time zones.
-# Use traditional English spelling, e.g. prefer `Rome' to `Roma', and
-# prefer `Athens' to the true name (which uses Greek letters).
-# The Posix file name restrictions encourage this rule.
-# Use the most populous among locations in a country's time zone,
-# e.g. prefer `Shanghai' to `Beijing'. Among locations with
-# similar populations, pick the best-known location,
-# e.g. prefer `Rome' to `Milan'.
-# Use the singular form, e.g. prefer `Canary' to `Canaries'.
-# Omit common suffixes like `_Islands' and `_City', unless that
-# would lead to ambiguity. E.g. prefer `Cayman' to
-# `Cayman_Islands' and `Guatemala' to `Guatemala_City',
-# but prefer `Mexico_City' to `Mexico' because the country
-# of Mexico has several time zones.
-# Use `_' to represent a space.
-# Omit `.' from abbreviations in names, e.g. prefer `St_Helena'
-# to `St._Helena'.
-#
-# For time zone abbreviations like `EST' I used the following rules,
-# in decreasing order of importance:
-#
-# Use abbreviations that consist of 3 or more upper-case Ascii letters,
-# except use "___" for locations while uninhabited.
-# Posix.1 requires at least 3 characters, and the restriction to
-# upper-case Ascii letters follows most traditions.
-# Previous editions of this database also used characters like
-# ' ' and '?', but these characters have a special meaning to
-# the shell and cause commands like
-# set `date`
-# to have unexpected effects. In theory, the character set could
-# be !%./@A-Z^_a-z{}, but these tables use only upper-case
-# Ascii letters (and "___").
-# Use abbreviations that are in common use among English-speakers,
-# e.g. `EST' for Eastern Standard Time in North America.
-# We assume that applications translate them to other languages
-# as part of the normal localization process; for example,
-# a French application might translate `EST' to `HNE'.
-# For zones whose times are taken from a city's longitude, use the
-# traditional xMT notation, e.g. `PMT' for Paris Mean Time.
-# The only name like this in current use is `GMT'.
-# If there is no common English abbreviation, abbreviate the English
-# translation of the usual phrase used by native speakers.
-# If this is not available or is a phrase mentioning the country
-# (e.g. ``Cape Verde Time''), then:
-#
-# When a country has a single or principal time zone region,
-# append `T' to the country's ISO code, e.g. `CVT' for
-# Cape Verde Time. For summer time append `ST';
-# for double summer time append `DST'; etc.
-# When a country has multiple time zones, take the first three
-# letters of an English place name identifying each zone
-# and then append `T', `ST', etc. as before;
-# e.g. `MOSST' for MOScow Summer Time.
-#
-#
# For Africa I invented the following time zone abbreviations.
# LMT Local Mean Time
# -1:00 AAT Atlantic Africa Time (no longer used)
diff --git a/time/europe b/time/europe
index c011424bdc..2948ba1caf 100644
--- a/time/europe
+++ b/time/europe
@@ -1,4 +1,4 @@
-# @(#)europe 7.45
+# @(#)europe 7.46
# 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
@@ -630,18 +630,18 @@
# came into force on 16 November. It restates the dates from the EC
# seventh Summer Time Directive....
#
-# From Peter Ilieve <peter@aldie.co.uk> (1997-03-28):
-# The [European] Transport Council discussed the proposed Eighth Directive
-# on 11 March and agreed [to] it, so it moves forward to the next stage,
-# from a Commission proposal to a Common Position.... What this means is:
-#
-# - The eighth directive proposal rules have been accepted.
-# These are the same as the current rules (last Sunday in March and last
-# Sunday in October). The rules will run until 2001.
-#
-# - The French have had their request to abandon summer time turned down.
-# They have been promised some sort of review in 1999 which might change
-# the rules for 2000 and 2001.
+# From Peter Ilieve <peter@aldie.co.uk> (1997-08-06):
+# I now have a copy of the ... Eighth Directive 97/44/EC of the European
+# Parliament and of the Council of 22 July 1997 on summer-time arrangements.
+# It runs for 4 years, 1998--2001, and confirms the current rules of
+# last Sunday in March to last Sunday in October....
+# The directive does not apply in overseas territories of the Member States.
+# It says the Commission should produce a proposal for 2002 and beyond
+# by 1 Jan 2000 and this should be adopted by 1 Jan 2001. I doubt that
+# this will happen though....
+# There is no mention of the French desire to abandon the whole idea.
+# France has had a change of government recently so maybe it will
+# be quietly dropped.
# From Peter Ilieve <peter@memex.co.uk> (1994-03-28):
# The [GB-Eire] end date of 22 October [1995] conflicts with your current rule
@@ -667,12 +667,12 @@
# Also, for lack of other data, we'll follow Shanks for Eire in 1940-1948.
#
# Given Peter Ilieve's comments, the following claims by Shanks are incorrect:
-# * Wales did not switch from GMT to daylight savings time until
+# * Wales did not switch from GMT to daylight saving time until
# 1921 Apr 3, when they began to conform with the rest of Great Britain.
# Actually, Wales was identical after 1880.
# * Eire had two transitions on 1916 Oct 1.
# It actually just had one transition.
-# * Northern Ireland used single daylight savings time throughout WW II.
+# * Northern Ireland used single daylight saving time throughout WW II.
# Actually, it conformed to Britain.
# * GB-Eire changed standard time to 1 hour ahead of GMT on 1968-02-18.
# Actually, that date saw the usual switch to summer time.
@@ -681,7 +681,7 @@
# The following claims by Shanks are possible though doubtful;
# we'll ignore them for now.
# * Jersey, Guernsey, and the Isle of Man did not switch from GMT
-# to daylight savings time until 1921 Apr 3, when they began to
+# to daylight saving time until 1921 Apr 3, when they began to
# conform with Great Britain.
# * Dublin's 1971-10-31 switch was at 02:00, even though London's was 03:00.
#
@@ -1047,7 +1047,7 @@ Zone Europe/Sarajevo 1:13:40 - LMT 1884
1:00 - CET 1941 Apr 18 23:00
1:00 C-Eur CE%sT 1945 May 8 2:00s
1:00 1:00 CEST 1945 Sep 16 2:00s
- 1:00 - CET 1982 Oct 11
+ 1:00 - CET 1982 Nov 27
1:00 EU CE%sT
# Bulgaria
@@ -1073,7 +1073,7 @@ Zone Europe/Zagreb 1:03:52 - LMT 1884
1:00 - CET 1941 Apr 18 23:00
1:00 C-Eur CE%sT 1945 May 8 2:00s
1:00 1:00 CEST 1945 Sep 16 2:00s
- 1:00 - CET 1982 Oct 11
+ 1:00 - CET 1982 Nov 27
1:00 EU CE%sT
# Czech Republic
@@ -1572,7 +1572,7 @@ Zone Europe/Skopje 1:25:44 - LMT 1884
1:00 - CET 1941 Apr 18 23:00
1:00 C-Eur CE%sT 1945 May 8 2:00s
1:00 1:00 CEST 1945 Sep 16 2:00s
- 1:00 - CET 1982 Oct 11
+ 1:00 - CET 1982 Nov 27
1:00 EU CE%sT
# Malta
@@ -1968,7 +1968,7 @@ Zone Europe/Ljubljana 0:58:04 - LMT 1884
1:00 - CET 1941 Apr 18 23:00
1:00 C-Eur CE%sT 1945 May 8 2:00s
1:00 1:00 CEST 1945 Sep 16 2:00s
- 1:00 - CET 1982 Oct 11
+ 1:00 - CET 1982 Nov 27
1:00 EU CE%sT
# Spain
@@ -2209,9 +2209,9 @@ Zone Europe/Belgrade 1:22:00 - LMT 1884
1:00 C-Eur CE%sT 1945 May 8 2:00s
1:00 1:00 CEST 1945 Sep 16 2:00s
# Metod Kozelj <metod.kozelj@rzs-hm.si> reports that the legal date of
-# transition to EU rules was 1982-10-11, for all of Yugoslavia at the time.
+# transition to EU rules was 1982-11-27, for all of Yugoslavia at the time.
# Shanks doesn't give as much detail, so go with Kozelj.
- 1:00 - CET 1982 Oct 11
+ 1:00 - CET 1982 Nov 27
1:00 EU CE%sT
###############################################################################
diff --git a/time/iso3166.tab b/time/iso3166.tab
index b5237783c4..6eb4d318db 100644
--- a/time/iso3166.tab
+++ b/time/iso3166.tab
@@ -7,6 +7,9 @@
# 2. The usual English name for the country,
# chosen so that alphabetic sorting of subsets produces helpful lists.
#
+# For France in Europe, we follow common practice and use FR,
+# even though FX might be more technically correct.
+#
# Columns are separated by a single tab.
# The table is sorted by country code.
#
@@ -86,6 +89,7 @@ FK Falkland Islands
FM Micronesia
FO Faeroe Islands
FR France
+FX France, Metropolitan
GA Gabon
GB Britain (UK)
GD Grenada
diff --git a/time/northamerica b/time/northamerica
index b70cb900c0..635c4ef180 100644
--- a/time/northamerica
+++ b/time/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica 7.31
+# @(#)northamerica 7.32
# also includes Central America and the Caribbean
# This data is by no means authoritative; if you think you know better,
@@ -1249,8 +1249,11 @@ Zone America/Martinique -4:04:20 - LMT 1890 # Fort-de-France
-4:00 - AST
# Montserrat
+# From Paul Eggert (1997-08-31):
+# Recent volcanic eruptions have forced evacuation of Plymouth, the capital.
+# Luckily, Olveston, the current de facto capital, has the same longitude.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Montserrat -4:08:52 - LMT 1911 Jul 1 0:01 # Plymouth
+Zone America/Montserrat -4:08:52 - LMT 1911 Jul 1 0:01 # Olveston
-4:00 - AST
# Nicaragua
diff --git a/time/southamerica b/time/southamerica
index 927f71638a..09e0aa6d28 100644
--- a/time/southamerica
+++ b/time/southamerica
@@ -1,4 +1,4 @@
-# @(#)southamerica 7.17
+# @(#)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
@@ -533,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
diff --git a/time/zone.tab b/time/zone.tab
index 48b32373cc..df4c157788 100644
--- a/time/zone.tab
+++ b/time/zone.tab
@@ -231,7 +231,7 @@ MO +2214+11335 Asia/Macao
MP +1512+14545 Pacific/Saipan
MQ +1436-06105 America/Martinique
MR +1806-01557 Africa/Nouakchott
-MS +1642-06213 America/Montserrat
+MS +1644-06213 America/Montserrat
MT +3554+01431 Europe/Malta
MU -2010+05730 Indian/Mauritius
MV +0410+07330 Indian/Maldives