In particular, this patch is makes the commentary more systematic about preferring "time zone" to "timezone" except when quoting someone else or when talking about code that uses "timezone". --- NEWS | 10 +++++----- README | 6 +++--- Theory | 6 +++--- africa | 2 +- asia | 2 +- australasia | 2 +- leapseconds.awk | 2 +- newctime.3 | 2 +- northamerica | 8 ++++---- southamerica | 12 ++++++------ tz-link.htm | 9 ++++----- zic.8 | 2 +- 12 files changed, 31 insertions(+), 32 deletions(-) diff --git a/NEWS b/NEWS index e7bafe8..30924d1 100644 --- a/NEWS +++ b/NEWS @@ -184,7 +184,7 @@ Release 2014f - 2014-08-05 17:42:36 -0700 are not already surrounded by white space. (Thanks to suggestions by Steffen Nurpmeso.) - There is new commentary about Xujiahui Observatory, the five timezone + There is new commentary about Xujiahui Observatory, the five time-zone project in China from 1918 to 1949, timekeeping in Japanese-occupied Shanghai, and Tibet Time in the 1950s. The sharp-eyed can spot the warlord Jin Shuren in the data. @@ -479,7 +479,7 @@ Release 2013h - 2013-10-25 15:32:32 -0700 Changes affecting documentation and commentary - tz-link.htm now mentions TC TIMEZONE's draft timezone service protocol + tz-link.htm now mentions TC TIMEZONE's draft time zone service protocol (thanks to Mike Douglass) and TimezoneJS.Date (thanks to Jim Fehrle). Update URLs in tz-link page. Add URLs for Microsoft Windows, since @@ -679,7 +679,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 The signatures of 'offtime', 'timeoff', and 'gtime' have been changed back to the old practice of using 'long' to represent UT offsets. This had been inadvertently and mistakenly changed to - 'int_fast32_t'. (Thanks to Christos Zoulos.) + 'int_fast32_t'. (Thanks to Christos Zoulas.) The code avoids undefined behavior on integer overflow in some more places, including gmtime, localtime, mktime and zdump. @@ -1110,7 +1110,7 @@ Release 2012a - 2012-03-01 18:28:10 +0700 Other minor changes are: Corrections to 1918 Canadian summer time end dates. - Updated URL for UK timezone history (in comments) + Updated URL for UK time zone history (in comments) A few typos in Le Corre's list of free French place names (comments) @@ -2668,7 +2668,7 @@ numbers. Release time stamps are taken from the release's commit (for newer, git releases), from the newest file in the tarball (for older releases, where this info is available) or from the email announcing -the release (if all else fails; these are marked with a timezone of +the release (if all else fails; these are marked with a time zone of -0000 and an "is missing!" comment). Earlier versions of the code and data were not announced on the tz diff --git a/README b/README index 0b0bbbe..a6796d7 100644 --- a/README +++ b/README @@ -50,13 +50,13 @@ If you know that the rules are different from those in a file, by all means feel free to change a file (and please send the changed version to tz@iana.org for use in the future). Europeans take note! -Thanks to these Timezone Caballeros who've made major contributions to the -time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz; +Thanks to these Time Zone Caballeros who've made major contributions to the +time conversion package: Keith Bostic; Bob Devine; Paul Eggert; Robert Elz; Guy Harris; Mark Horton; John Mackin; and Bradley White. Thanks also to Michael Bloom, Art Neilson, Stephen Prince, John Sovereign, and Frank Wales for testing work, and to Gwillim Law for checking local mean time data. Thanks in particular to Arthur David Olson, the project's founder and first -maintainer, to whom the timezone community owes the greatest debt of all. +maintainer, to whom the time zone community owes the greatest debt of all. None of them are responsible for remaining errors. Look in <ftp://ftp.iana.org/tz/releases/> for updated versions of these files. diff --git a/Theory b/Theory index d23dac3..42070e4 100644 --- a/Theory +++ b/Theory @@ -127,7 +127,7 @@ These are the extensions that have been made to the POSIX functions: consideration was given to using some other environment variable (for example, "TIMEZONE") to hold the string used to generate the time zone information file name. In the end, however, it was decided - to continue using "TZ": it is widely used for time zone purposes; + to continue using "TZ": it is widely used for time zone purposes; separately maintaining both "TZ" and "TIMEZONE" seemed a nuisance; and systems where "new" forms of "TZ" might cause problems can simply use TZ values such as "EST5EDT" which can be used both by @@ -710,9 +710,9 @@ Gregorian calendar: The Russian empire (including Finland and the Baltic states) did not convert to the Gregorian calendar until the Soviet revolution of 1917. -Source: H. Grotefend, _Taschenbuch der Zeitrechnung des deutschen +Source: H. Grotefend, _Taschenbuch der Zeitrechnung des deutschen Mittelalters und der Neuzeit_, herausgegeben von Dr. O. Grotefend -(Hannover: Hahnsche Buchhandlung, 1941), pp. 26-28. +(Hannover: Hahnsche Buchhandlung, 1941), pp. 26-28. ----- Time and time zones on Mars ----- diff --git a/africa b/africa index 339d6c4..9f819f7 100644 --- a/africa +++ b/africa @@ -606,7 +606,7 @@ Zone Africa/Blantyre 2:20:00 - LMT 1903 Mar # From Alex Krivenyshev (2008-07-11): # Seems that English language article "The revival of daylight saving -# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally +# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally # published on Monday, June 30, 2008... # # I guess that article in French "Le gouvernement avance l'introduction diff --git a/asia b/asia index 2536f72..09aaa24 100644 --- a/asia +++ b/asia @@ -1915,7 +1915,7 @@ Zone Asia/Hovd 6:06:36 - LMT 1905 Aug Zone Asia/Ulaanbaatar 7:07:32 - LMT 1905 Aug 7:00 - ULAT 1978 # Ulaanbaatar Time 8:00 Mongol ULA%sT -# Choibalsan, a.k.a. Bajan Tuemen, Bajan Tumen, Chojbalsan, +# Choibalsan, a.k.a. Bajan Tümen, Bajan Tumen, Chojbalsan, # Choybalsan, Sanbejse, Tchoibalsan Zone Asia/Choibalsan 7:38:00 - LMT 1905 Aug 7:00 - ULAT 1978 diff --git a/australasia b/australasia index 4911e8d..2ee4cbe 100644 --- a/australasia +++ b/australasia @@ -717,7 +717,7 @@ Zone Pacific/Funafuti 11:56:52 - LMT 1901 # From Mark Brader (2005-01-23): # [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies, # published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3] -# reproduced a Pan American Airways timeables from 1936, for their weekly +# reproduced a Pan American Airways timetable from 1936, for their weekly # "Orient Express" flights between San Francisco and Manila, and connecting # flights to Chicago and the US East Coast. As it uses some time zone # designations that I've never seen before:.... diff --git a/leapseconds.awk b/leapseconds.awk index 739615a..c2079dc 100644 --- a/leapseconds.awk +++ b/leapseconds.awk @@ -3,7 +3,7 @@ # This file is in the public domain. BEGIN { - print "# Allowance for leapseconds added to each timezone file." + print "# Allowance for leap seconds added to each time zone file." print "" print "# This file is in the public domain." print "" diff --git a/newctime.3 b/newctime.3 index 2e1d937..dccab77 100644 --- a/newctime.3 +++ b/newctime.3 @@ -189,7 +189,7 @@ includes the following fields: int tm_wday; /\(** day of week (Sunday = 0) \(**/ int tm_yday; /\(** day of year (0\*(en365) \(**/ int tm_isdst; /\(** is summer time in effect? \(**/ - char \(**tm_zone; /\(** abbreviation of timezone name \(**/ + char \(**tm_zone; /\(** abbreviation of time zone name \(**/ long tm_gmtoff; /\(** offset from UT in seconds \(**/ .fi .RE diff --git a/northamerica b/northamerica index 7074d31..9a306b8 100644 --- a/northamerica +++ b/northamerica @@ -545,7 +545,7 @@ Zone America/Adak 12:13:21 - LMT 1867 Oct 18 # Minutes of the Unalaska City Council Meeting, January 10, 1967: # "Except for St. Paul and Akutan, Unalaska is the only important # location not on Alaska Standard Time. The following resolution was -# made by William Robinson and seconded by Henry Swanson: Be it +# made by William Robinson and seconded by Henry Swanson: Be it # resolved that the City of Unalaska hereby goes to Alaska Standard # Time as of midnight Friday, January 13, 1967 (1 A.M. Saturday, # January 14, Alaska Standard Time.) This resolution was passed with @@ -578,7 +578,7 @@ Zone America/Adak 12:13:21 - LMT 1867 Oct 18 # year, the standard time of this Territory shall be advanced one # hour...This Act shall take effect upon its approval. Approved this 26th # day of April, A. D. 1933. LAWRENCE M JUDD, Governor of the Territory of -# Hawaii." Page 172: "Act 163...Act 90 of the Session Laws of 1933 is +# Hawaii." Page 172: "Act 163...Act 90 of the Session Laws of 1933 is # hereby repealed...This Act shall take effect upon its approval, upon # which date the standard time of this Territory shall be restored to # that existing immediately prior to the taking effect of said Act 90. @@ -1827,7 +1827,7 @@ Zone America/Edmonton -7:33:52 - LMT 1906 Sep # 1. 1884 or 1885: adoption of Mountain Standard Time (GMT-7) # Exact date unknown # 2. Oct 1916: switch to Pacific Standard Time (GMT-8) -# Exact date in October unknown; Sunday October 1 is a reasonable guess. +# Exact date in October unknown; Sunday October 1 is a reasonable guess. # 3. June 1918: switch to Pacific Daylight Time (GMT-7) # Exact date in June unknown; Sunday June 2 is a reasonable guess. # note#1: @@ -3034,7 +3034,7 @@ Zone America/Martinique -4:04:20 - LMT 1890 # Fort-de-France # From Gwillim Law (2005-04-21): # The Associated Press story on the time change, which can be found at # http://www.lapalmainteractivo.com/guias/content/gen/ap/America_Latina/AMC_GE... -# and elsewhere, says (fifth paragraph, translated from Spanish): "The last +# and elsewhere, says (fifth paragraph, translated from Spanish): "The last # time that a change of clocks was applied to save energy was in the year 2000 # during the Arnoldo Alemán administration."... # The northamerica file says that Nicaragua has been on UTC-6 continuously diff --git a/southamerica b/southamerica index ba88fd2..e0c83ac 100644 --- a/southamerica +++ b/southamerica @@ -225,9 +225,9 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S # It's Law No. 7,210. This change is due to a public power emergency, so for # now we'll assume it's for this year only. # -# From Paul Eggert (2006-03-22): -# Hora de verano para la Republica Argentina (2003-06-08) -# <http://www.spicasc.net/horvera.html> +# From Paul Eggert (2014-08-09): +# Hora de verano para la República Argentina +# http://buenasiembra.com.ar/esoterismo/astrologia/hora-de-verano-de-la-republ... # says that standard time in Argentina from 1894-10-31 # to 1920-05-01 was -4:16:48.25. Go with this more-precise value # over Shanks & Pottenger. @@ -394,7 +394,7 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S # ... # From Alexander Krivenyshev (2010-04-09): -# According to news reports from El Diario de la Republica Province San +# According to news reports from El Diario de la República Province San # Luis, Argentina (standard time UTC-04) will keep Daylight Saving Time # after April 11, 2010 - will continue to have same time as rest of # Argentina (UTC-3) (no DST). @@ -685,7 +685,7 @@ Zone America/La_Paz -4:32:36 - LMT 1890 # Oficial da União"...) in Brazil there are changes in the timezones, # effective today (00:00am at June 24, 2008) as follows: # -# a) The timezone UTC+5 is e[x]tinguished, with all the Acre state and the +# a) The timezone UTC+5 is extinguished, with all the Acre state and the # part of the Amazonas state that had this timezone now being put to the # timezone UTC+4 # b) The whole Pará state now is put at timezone UTC+3, instead of just @@ -1657,7 +1657,7 @@ Rule Uruguay 1990 1991 - Oct Sun>=21 0:00 1:00 S Rule Uruguay 1992 only - Oct 18 0:00 1:00 S Rule Uruguay 1993 only - Feb 28 0:00 0 - # From Eduardo Cota (2004-09-20): -# The uruguayan government has decreed a change in the local time.... +# The Uruguayan government has decreed a change in the local time.... # http://www.presidencia.gub.uy/decretos/2004091502.htm Rule Uruguay 2004 only - Sep 19 0:00 1:00 S # From Steffen Thorsen (2005-03-11): diff --git a/tz-link.htm b/tz-link.htm index 8321a7a..9a47d45 100644 --- a/tz-link.htm +++ b/tz-link.htm @@ -179,7 +179,7 @@ timezone information for all countries</a> displays tables of DST rules. Time Zones</a> lets you sort zone names and convert times.</li> <li><a href="http://permatime.com/">Permatime</a> generates and views links that refer to a particular point in time and can be displayed in -multiple timezones.</li> +multiple time zones.</li> <li><a href="http://www.zeitverschiebung.net/en/">Time Difference</a> calculates the current time difference between locations.</li> <li><a href="http://www.wx-now.com/">Weather Now</a> lists the weather too.</li> @@ -211,7 +211,7 @@ recommendations for the use of VTIMEZONE and <code><abbr>tz</abbr></code>.</li> <li>CalConnect's <a href="http://calconnect.org/tc-timezone.shtml">TIMEZONE Technical Committee</a> has developed a <a href="http://tools.ietf.org/html/draft-douglass-timezone-service-11">draft -timezone service protocol</a> along with a <a +time zone service protocol</a> along with a <a href="http://tools.ietf.org/html/draft-daboo-caldav-timezone-ref-01">draft extension</a> to the <a href="http://caldav.calconnect.org/">CalDAV calendar access protocol</a> to allow time zone information to be exchanged @@ -235,8 +235,7 @@ href="http://www.w3.org/2000/01/foo">schema</a> was sketched out.</li> </ul> <h2>Other <code><abbr>tz</abbr></code> compilers</h2> <ul> -<li><a href="http://sourceforge.net/projects/vzic/">Vzic iCalendar -Timezone Converter</a> describes a <a +<li><a href="http://sourceforge.net/projects/vzic/">Vzic</a> is a <a href="http://en.wikipedia.org/wiki/C_%28programming_language%29">C</a> program that compiles <code><abbr>tz</abbr></code> source into iCalendar-compatible VTIMEZONE files. @@ -378,7 +377,7 @@ implementations contain a copy of a 32-bit subset of a recent Go-specific format.</li> <li><a href="http://users.skynet.be/Peter.Verthez/projects/intclock/">International -clock (intclock)</a> is a multi-timezone clock for +clock (intclock)</a> is a clock that displays multiple time zones on <abbr>GNU</abbr>/Linux and similar systems. It is freely available under the <abbr>GPL</abbr>.</li> <li><a diff --git a/zic.8 b/zic.8 index bf84c25..923ce1d 100644 --- a/zic.8 +++ b/zic.8 @@ -529,7 +529,7 @@ but this changed to the last Sunday in October starting in 1996. For purposes of display, "LMT" and "BMT" were initially used, respectively. Since Swiss rules and later EU rules were applied, the display name for the -timezone has been CET for standard time and CEST for daylight saving +time zone has been CET for standard time and CEST for daylight saving time. .SH NOTES For areas with more than two types of local time, -- 1.9.1