summaryrefslogtreecommitdiff
path: root/share/zoneinfo/datfiles
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2006-10-29 22:21:34 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2006-10-29 22:21:34 +0000
commit1b798a075419135f8a1e32466411468f2b65a42a (patch)
treeac6f6e21d55594c74a9307ec022e9a854501b194 /share/zoneinfo/datfiles
parenta457faea1d22a3f4f46bd9ea76ec2c1461331b50 (diff)
Uncomment changes made for the Energy Policy Act of 2005; it looks
like they will actually happen.
Diffstat (limited to 'share/zoneinfo/datfiles')
-rw-r--r--share/zoneinfo/datfiles/northamerica14
1 files changed, 5 insertions, 9 deletions
diff --git a/share/zoneinfo/datfiles/northamerica b/share/zoneinfo/datfiles/northamerica
index be39d849431..80b68dcdd00 100644
--- a/share/zoneinfo/datfiles/northamerica
+++ b/share/zoneinfo/datfiles/northamerica
@@ -1,4 +1,4 @@
-# $OpenBSD: northamerica,v 1.22 2006/10/05 18:09:03 millert Exp $
+# $OpenBSD: northamerica,v 1.23 2006/10/29 22:21:33 millert Exp $
# @(#)northamerica 8.8
# <pre>
@@ -125,18 +125,14 @@ 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
-# The Energy Policy Act of 2005 changed the end month of DST from Oct to Nov
-Rule US 1967 max - Oct lastSun 2:00 0 S
-#Rule US 1967 2006 - Oct lastSun 2:00 0 S
+Rule US 1967 2006 - Oct lastSun 2:00 0 S
Rule US 1967 1973 - Apr lastSun 2:00 1:00 D
Rule US 1974 only - Jan 6 2:00 1:00 D
Rule US 1975 only - Feb 23 2:00 1:00 D
Rule US 1976 1986 - Apr lastSun 2:00 1:00 D
-# The Energy Policy Act of 2005 changed the start month of DST from Apr to Mar
-Rule US 1987 max - Apr Sun>=1 2:00 1:00 D
-#Rule US 1987 2006 - Apr Sun>=1 2:00 1:00 D
-#Rule US 2007 max - Mar Sun>=8 2:00 1:00 D
-#Rule US 2007 max - Nov Sun>=1 2:00 0 S
+Rule US 1987 2006 - Apr Sun>=1 2:00 1:00 D
+Rule US 2007 max - Mar Sun>=8 2:00 1:00 D
+Rule US 2007 max - Nov Sun>=1 2:00 0 S
# From Arthur David Olson, 2005-12-19
# We generate the files specified below to guard against old files with