summaryrefslogtreecommitdiff
path: root/share/zoneinfo/northamerica
diff options
context:
space:
mode:
Diffstat (limited to 'share/zoneinfo/northamerica')
-rw-r--r--share/zoneinfo/northamerica39
1 files changed, 37 insertions, 2 deletions
diff --git a/share/zoneinfo/northamerica b/share/zoneinfo/northamerica
index 9cd74b174c45e..479f3fcb80f2c 100644
--- a/share/zoneinfo/northamerica
+++ b/share/zoneinfo/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica 7.11
+# @(#)northamerica 7.15
# also includes Central America and the Caribbean
# This data is by no means authoritative; if you think you know better,
@@ -148,7 +148,7 @@ Zone America/Phoenix -7:00 US M%sT 1946
# large size and location in three states." (The "only" means that other
# tribal nations don't use DST.)
-Link America/Denver Navajo
+Link America/Denver America/Shiprock
# From Bob Devine (January 28, 1988):
# Michigan didn't observe DST from 1968 to 1973.
@@ -223,6 +223,8 @@ Link Pacific/Honolulu HST
# I invented the abbreviation SPST for St Pierre Standard Time; SPDT likewise.
# Corrections are welcome!
#
+# See the `europe' file for Greenland.
+#
# See the `africa' file for Zone naming conventions.
@@ -301,6 +303,39 @@ Link Pacific/Honolulu HST
# East-Saskatchewan kept to avoid problems for folks using that zone by name;
# plain Saskatchewan added.
+# From Alain LaBont<e'> <ALB@immedia.ca> (1994-11-14):
+# I post here the time zone abbreviations standardized in Canada
+# for both English and French in the CAN/CSA-Z234.4-89 standard....
+#
+# UTC Standard time Daylight savings time
+# offset French English French English
+# -2:30 - - HAT NDT
+# -3 - - HAA ADT
+# -3:30 HNT NST - -
+# -4 HNA AST HAE EDT
+# -5 HNE EST HAC CDT
+# -6 HNC CST HAR MDT
+# -7 HNR MST HAP PDT
+# -8 HNP PST HAY YDT
+# -9 HNY YST - -
+#
+# HN: Heure Normale ST: Standard Time
+# HA: Heure Avanc<e'>e DT: Daylight saving Time
+#
+# A: de l'Atlantique Atlantic
+# C: du Centre Central
+# E: de l'Est Eastern
+# M: Mountain
+# N: Newfoundland
+# P: du Pacifique Pacific
+# R: des Rocheuses
+# T: de Terre-Neuve
+# Y: du Yukon Yukon
+#
+# From Paul Eggert <eggert@twinsun.com> (1994-11-22):
+# Alas, this sort of thing must be handled by localization software.
+
+
# From Shanks (1991):
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S