[tz] [PATCH 1/3] * backward: Move some links back to primary files.
Paul Eggert
eggert at cs.ucla.edu
Tue Sep 3 07:33:00 UTC 2013
This should allay concerns that the links would go away any time soon.
Suggested by Stephen Colebourne in
<http://mm.icann.org/pipermail/tz/2013-September/019801.html>.
Change "`" to "'"; these days, "`" and "'" are not symmetric.
* antarctica (Antarctica/McMurdo):
* europe (Europe/Jersey, Europe/Guernsey, Europe/Isle_of_Man)
(Europe/Mariehamn, Europe/Busingen, Europe/Vatican, Europe/San_Marino)
(Arctic/Longyearbyen, Europe/Ljubljana, Europe/Podgorica)
(Europe/Sarajevo, Europe/Skopje, Europe/Zagreb, Europe/Bratislava):
* northamerica (America/St_Barthelemy, America/Marigot):
* southamerica (America/Lower_Princes, America/Kralendijk):
Move here from 'backward'. This reverts a 2013-08-09 change.
---
antarctica | 15 +++++++--------
backward | 19 -------------------
europe | 28 +++++++++++++++++++++-------
northamerica | 44 +++++++++++++++++++++++---------------------
southamerica | 12 ++++++++----
5 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/antarctica b/antarctica
index 4cb7476..234e59c 100644
--- a/antarctica
+++ b/antarctica
@@ -16,9 +16,9 @@
#
# Except for the French entries,
# I made up all time zone abbreviations mentioned here; corrections welcome!
-# FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited.
+# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
-# These rules are stolen from the `southamerica' file.
+# 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
@@ -231,7 +231,7 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 29
# Scott Base, Ross Island, since 1957-01.
# See Pacific/Auckland.
#
-# These rules for New Zealand are stolen from the `australasia' file.
+# These rules for New Zealand are stolen from the 'australasia' file.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D
Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D
@@ -269,11 +269,11 @@ Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 S
# From Lee Hotz (2001-03-08):
# I queried the folks at Columbia who spent the summer at Vostok and this is
# what they had to say about time there:
-# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo)
+# "in the US Camp (East Camp) we have been on New Zealand (McMurdo)
# time, which is 12 hours ahead of GMT. The Russian Station Vostok was
# 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead
# of GMT). This is a time zone I think two hours east of Moscow. The
-# natural time zone is in between the two: 8 hours ahead of GMT.''
+# natural time zone is in between the two: 8 hours ahead of GMT."
#
# From Paul Eggert (2001-05-04):
# This seems to be hopelessly confusing, so I asked Lee Hotz about it
@@ -339,10 +339,7 @@ Zone Antarctica/Palmer 0 - zzz 1965
#
#
# McMurdo Station, Ross Island, since 1955-12
-# See Pacific/Auckland.
-#
# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20
-# See Pacific/Auckland.
#
# From Chris Carrier (1996-06-27):
# Siple, the first commander of the South Pole station,
@@ -363,3 +360,5 @@ Zone Antarctica/Palmer 0 - zzz 1965
# makes all of the clocks run fast. So every couple of days,
# we have to go around and set them back 5 minutes or so.
# Maybe if we let them run fast all of the time, we'd get to leave here sooner!!
+
+Link Pacific/Auckland Antarctica/McMurdo
diff --git a/backward b/backward
index 561e2ff..b8db6bb 100644
--- a/backward
+++ b/backward
@@ -18,19 +18,13 @@ Link America/Indiana/Indianapolis America/Fort_Wayne
Link America/Indiana/Indianapolis America/Indianapolis
Link America/Argentina/Jujuy America/Jujuy
Link America/Indiana/Knox America/Knox_IN
-Link America/Curacao America/Kralendijk
Link America/Kentucky/Louisville America/Louisville
-Link America/Curacao America/Lower_Princes
-Link America/Guadeloupe America/Marigot
Link America/Argentina/Mendoza America/Mendoza
Link America/Rio_Branco America/Porto_Acre
Link America/Argentina/Cordoba America/Rosario
Link America/Denver America/Shiprock
-Link America/Guadeloupe America/St_Barthelemy
Link America/St_Thomas America/Virgin
-Link Pacific/Auckland Antarctica/McMurdo
Link Pacific/Auckland Antarctica/South_Pole
-Link Europe/Oslo Arctic/Longyearbyen
Link Asia/Ashgabat Asia/Ashkhabad
Link Asia/Kolkata Asia/Calcutta
Link Asia/Chongqing Asia/Chungking
@@ -74,20 +68,7 @@ Link America/Havana Cuba
Link Africa/Cairo Egypt
Link Europe/Dublin Eire
Link Europe/London Europe/Belfast
-Link Europe/Prague Europe/Bratislava
-Link Europe/Zurich Europe/Busingen
-Link Europe/London Europe/Guernsey
-Link Europe/London Europe/Isle_of_Man
-Link Europe/London Europe/Jersey
-Link Europe/Belgrade Europe/Ljubljana
-Link Europe/Helsinki Europe/Mariehamn
-Link Europe/Belgrade Europe/Podgorica
-Link Europe/Rome Europe/San_Marino
-Link Europe/Belgrade Europe/Sarajevo
-Link Europe/Belgrade Europe/Skopje
Link Europe/Chisinau Europe/Tiraspol
-Link Europe/Rome Europe/Vatican
-Link Europe/Belgrade Europe/Zagreb
Link Europe/London GB
Link Europe/London GB-Eire
Link Etc/GMT GMT+0
diff --git a/europe b/europe
index 52f15e1..4f972a5 100644
--- a/europe
+++ b/europe
@@ -440,6 +440,9 @@ Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s
1:00 - BST 1971 Oct 31 2:00u
0:00 GB-Eire %s 1996
0:00 EU GMT/BST
+Link Europe/London Europe/Jersey
+Link Europe/London Europe/Guernsey
+Link Europe/London Europe/Isle_of_Man
Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2
-0:25:21 - DMT 1916 May 21 2:00
-0:25:21 1:00 IST 1916 Oct 1 2:00s
@@ -1105,7 +1108,9 @@ Zone Europe/Helsinki 1:39:52 - LMT 1878 May 31
1:39:52 - HMT 1921 May # Helsinki Mean Time
2:00 Finland EE%sT 1983
2:00 EU EE%sT
-# Use Europe/Helsinki for the Aaland Islands.
+
+# Aaland Is
+Link Europe/Helsinki Europe/Mariehamn
# France
@@ -1255,7 +1260,10 @@ Zone Europe/Berlin 0:53:28 - LMT 1893 Apr
# Source for the time in Busingen 1980:
# http://www.srf.ch/player/video?id=c012c029-03b7-4c2b-9164-aa5902cd58d3
-# Use Europe/Zurich for Busingen.
+# From Arthur David Olson (2012-03-03):
+# Busingen and Zurich have shared clocks since 1970.
+
+Link Europe/Zurich Europe/Busingen
# Georgia
# Please see the "asia" file for Asia/Tbilisi.
@@ -1474,7 +1482,9 @@ Zone Europe/Rome 0:49:56 - LMT 1866 Sep 22
1:00 C-Eur CE%sT 1944 Jul
1:00 Italy CE%sT 1980
1:00 EU CE%sT
-# Use Europe/Rome also for San Marino and Vatican City.
+
+Link Europe/Rome Europe/Vatican
+Link Europe/Rome Europe/San_Marino
# Latvia
@@ -1853,7 +1863,7 @@ Zone Europe/Oslo 0:43:00 - LMT 1895 Jan 1
# before 1895, and therefore probably changed the local time somewhere
# between 1895 and 1925 (inclusive).
-# From Paul Eggert (2013-08-09):
+# From Paul Eggert (2013-09-02):
#
# Actually, Jan Mayen was never occupied by Germany during World War II,
# so it must have diverged from Oslo time during the war, as Oslo was
@@ -1879,6 +1889,7 @@ Zone Europe/Oslo 0:43:00 - LMT 1895 Jan 1
#
# All these events predate our cutoff date of 1970, so use Europe/Oslo
# for these regions.
+Link Europe/Oslo Arctic/Longyearbyen
# Poland
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -2449,11 +2460,14 @@ Zone Europe/Belgrade 1:22:00 - LMT 1884
# Shanks & Pottenger don't give as much detail, so go with Kozelj.
1:00 - CET 1982 Nov 27
1:00 EU CE%sT
-# Use Europe/Belgrade also for Bosnia and Herzegovina, Croatia, Macedonia,
-# Montenegro, and Slovenia.
+Link Europe/Belgrade Europe/Ljubljana # Slovenia
+Link Europe/Belgrade Europe/Podgorica # Montenegro
+Link Europe/Belgrade Europe/Sarajevo # Bosnia and Herzegovina
+Link Europe/Belgrade Europe/Skopje # Macedonia
+Link Europe/Belgrade Europe/Zagreb # Croatia
# Slovakia
-# See Europe/Prague.
+Link Europe/Prague Europe/Bratislava
# Slovenia
# See Europe/Belgrade.
diff --git a/northamerica b/northamerica
index 418261f..d3b124e 100644
--- a/northamerica
+++ b/northamerica
@@ -20,7 +20,7 @@
# Howse writes (pp 121-125) that time zones were invented by
# Professor Charles Ferdinand Dowd (1825-1904),
# Principal of Temple Grove Ladies' Seminary (Saratoga Springs, NY).
-# His pamphlet ``A System of National Time for Railroads'' (1870)
+# His pamphlet "A System of National Time for Railroads" (1870)
# was the result of his proposals at the Convention of Railroad Trunk Lines
# in New York City (1869-10). His 1870 proposal was based on Washington, DC,
# but in 1872-05 he moved the proposed origin to Greenwich.
@@ -40,8 +40,8 @@
# From Paul Eggert (2001-03-06):
# Daylight Saving Time was first suggested as a joke by Benjamin Franklin
-# in his whimsical essay ``An Economical Project for Diminishing the Cost
-# of Light'' published in the Journal de Paris (1784-04-26).
+# in his whimsical essay "An Economical Project for Diminishing the Cost
+# of Light" published in the Journal de Paris (1784-04-26).
# Not everyone is happy with the results:
#
# I don't really care how time is reckoned so long as there is some
@@ -167,8 +167,8 @@ Zone PST8PDT -8:00 US P%sT
# of the Aleutian islands. No DST.
# From Paul Eggert (1995-12-19):
-# The tables below use `NST', not `NT', for Nome Standard Time.
-# I invented `CAWT' for Central Alaska War Time.
+# The tables below use 'NST', not 'NT', for Nome Standard Time.
+# I invented 'CAWT' for Central Alaska War Time.
# From U. S. Naval Observatory (1989-01-19):
# USA EASTERN 5 H BEHIND UTC NEW YORK, WASHINGTON
@@ -237,9 +237,9 @@ Zone PST8PDT -8:00 US P%sT
# H.R. 6, Energy Policy Act of 2005, SEC. 110. DAYLIGHT SAVINGS.
# (a) Amendment- Section 3(a) of the Uniform Time Act of 1966 (15
# U.S.C. 260a(a)) is amended--
-# (1) by striking `first Sunday of April' and inserting `second
+# (1) by striking 'first Sunday of April' and inserting 'second
# Sunday of March'; and
-# (2) by striking `last Sunday of October' and inserting `first
+# (2) by striking 'last Sunday of October' and inserting 'first
# Sunday of November'.
# (b) Effective Date- Subsection (a) shall take effect 1 year after the
# date of enactment of this Act or March 1, 2007, whichever is later.
@@ -678,13 +678,13 @@ Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11
# and Switzerland counties have their own time zone histories as noted below.
#
# Shanks partitioned Indiana into 345 regions, each with its own time history,
-# and wrote ``Even newspaper reports present contradictory information.''
+# and wrote "Even newspaper reports present contradictory information."
# Those Hoosiers! Such a flighty and changeable people!
# Fortunately, most of the complexity occurred before our cutoff date of 1970.
#
# Other than Indianapolis, the Indiana place names are so nondescript
-# that they would be ambiguous if we left them at the `America' level.
-# So we reluctantly put them all in a subdirectory `America/Indiana'.
+# that they would be ambiguous if we left them at the 'America' level.
+# So we reluctantly put them all in a subdirectory 'America/Indiana'.
# From Paul Eggert (2005-08-16):
# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
@@ -948,8 +948,8 @@ Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 12:20:36
# This story is too entertaining to be false, so go with Howse over Shanks.
#
# From Paul Eggert (2001-03-06):
-# Garland (1927) writes ``Cleveland and Detroit advanced their clocks
-# one hour in 1914.'' This change is not in Shanks. We have no more
+# Garland (1927) writes "Cleveland and Detroit advanced their clocks
+# one hour in 1914." This change is not in Shanks. We have no more
# info, so omit this for now.
#
# Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
@@ -989,7 +989,7 @@ Zone America/Menominee -5:50:27 - LMT 1885 Sep 18 12:00
# occupied 1857/1900 by the Navassa Phosphate Co
# US lighthouse 1917/1996-09
# currently uninhabited
-# see Mark Fineman, ``An Isle Rich in Guano and Discord'',
+# see Mark Fineman, "An Isle Rich in Guano and Discord",
# _Los Angeles Times_ (1998-11-10), A1, A10; it cites
# Jimmy Skaggs, _The Great Guano Rush_ (1994).
@@ -1023,7 +1023,7 @@ Zone America/Menominee -5:50:27 - LMT 1885 Sep 18 12:00
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
# <http://www.jstor.org/stable/1774359>.
#
-# See the `europe' file for Greenland.
+# See the 'europe' file for Greenland.
# Canada
@@ -1224,7 +1224,7 @@ Zone America/St_Johns -3:30:52 - LMT 1884
# most of east Labrador
-# The name `Happy Valley-Goose Bay' is too long; use `Goose Bay'.
+# The name 'Happy Valley-Goose Bay' is too long; use 'Goose Bay'.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Goose_Bay -4:01:40 - LMT 1884 # Happy Valley-Goose Bay
-3:30:52 - NST 1918
@@ -1405,7 +1405,6 @@ Zone America/Montreal -4:54:16 - LMT 1884
-5:00 Mont E%sT 1974
-5:00 Canada E%sT
-
# Ontario
# From Paul Eggert (2006-07-09):
@@ -2211,7 +2210,7 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
# From Paul Eggert (1996-06-12):
# For an English translation of the decree, see
# <a href="http://mexico-travel.com/extra/timezone_eng.html">
-# ``Diario Oficial: Time Zone Changeover'' (1996-01-04).
+# "Diario Oficial: Time Zone Changeover" (1996-01-04).
# </a>
# From Rives McDow (1998-10-08):
@@ -2640,7 +2639,7 @@ Rule CR 1991 1992 - Jan Sat>=15 0:00 1:00 D
# go with Shanks & Pottenger.
Rule CR 1991 only - Jul 1 0:00 0 S
Rule CR 1992 only - Mar 15 0:00 0 S
-# There are too many San Joses elsewhere, so we'll use `Costa Rica'.
+# There are too many San Joses elsewhere, so we'll use 'Costa Rica'.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Costa_Rica -5:36:13 - LMT 1890 # San Jose
-5:36:13 - SJMT 1921 Jan 15 # San Jose Mean Time
@@ -2931,7 +2930,10 @@ Zone America/Grenada -4:07:00 - LMT 1911 Jul # St George's
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe a Pitre
-4:00 - AST
-# Use America/Guadeloupe also for St Barthelemy and for St Martin (French part).
+# St Barthelemy
+Link America/Guadeloupe America/St_Barthelemy
+# St Martin (French part)
+Link America/Guadeloupe America/Marigot
# Guatemala
#
@@ -3177,7 +3179,7 @@ Zone America/Panama -5:18:08 - LMT 1890
-5:00 - EST
# Puerto Rico
-# There are too many San Juans elsewhere, so we'll use `Puerto_Rico'.
+# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12:00 # San Juan
-4:00 - AST 1942 May 3
@@ -3196,7 +3198,7 @@ Zone America/St_Lucia -4:04:00 - LMT 1890 # Castries
-4:00 - AST
# St Pierre and Miquelon
-# There are too many St Pierres elsewhere, so we'll use `Miquelon'.
+# There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre
-4:00 - AST 1980 May
diff --git a/southamerica b/southamerica
index ff47cef..ea264a1 100644
--- a/southamerica
+++ b/southamerica
@@ -1349,9 +1349,13 @@ Zone America/Curacao -4:35:47 - LMT 1912 Feb 12 # Willemstad
-4:30 - ANT 1965 # Netherlands Antilles Time
-4:00 - AST
-# Sint Maarten
-# Caribbean Netherlands
-# Use America/Curacao.
+# From Arthur David Olson (2011-06-15):
+# use links for places with new iso3166 codes.
+# The name "Lower Prince's Quarter" is both longer than fourteen charaters
+# and contains an apostrophe; use "Lower_Princes" below.
+
+Link America/Curacao America/Lower_Princes # Sint Maarten
+Link America/Curacao America/Kralendijk # Caribbean Netherlands
# Ecuador
#
@@ -1646,7 +1650,7 @@ Rule Uruguay 1937 1941 - Mar lastSun 0:00 0 -
# Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
Rule Uruguay 1937 1940 - Oct lastSun 0:00 0:30 HS
# Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
-# and 1943 Apr 13 ``to present time''; go with Shanks & Pottenger.
+# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger.
Rule Uruguay 1941 only - Aug 1 0:00 0:30 HS
Rule Uruguay 1942 only - Jan 1 0:00 0 -
Rule Uruguay 1942 only - Dec 14 0:00 1:00 S
--
1.8.1.2
More information about the tz
mailing list