[tz] [PROPOSED 3/3] Prefer “timestamp” to “time stamp”

Paul Eggert eggert at cs.ucla.edu
Mon May 28 06:39:59 UTC 2018


POSIX uses the single-word form, so use that.
Change a “time keeping” to “timekeeping” while we’re at it.
However, do not change quotations from others.
---
 Makefile     |   2 +-
 NEWS         | 154 +++++++++++++++++++++++++--------------------------
 asia         |   2 +-
 backzone     |   4 +-
 europe       |   4 +-
 southamerica |   2 +-
 theory.html  |   2 +-
 tz-link.html |  10 ++--
 zdump.8      |   6 +-
 zic.8        |   6 +-
 zic.c        |   6 +-
 zone1970.tab |   2 +-
 12 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/Makefile b/Makefile
index 06f7fd6..389a6db 100644
--- a/Makefile
+++ b/Makefile
@@ -820,7 +820,7 @@ $(MANTXTS):	workman.sh
 		LC_ALL=C sh workman.sh `expr $@ : '\(.*\)\.txt$$'` >$@.out
 		mv $@.out $@
 
-# Set the time stamps to those of the git repository, if available,
+# Set the timestamps to those of the git repository, if available,
 # and if the files have not changed since then.
 # This uses GNU 'touch' syntax 'touch -d at N FILE',
 # where N is the number of seconds since 1970.
diff --git a/NEWS b/NEWS
index 6bd89c2..9bbe579 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ News for the tz database
 
 Unreleased, experimental changes
 
-  Changes to past time stamps
+  Changes to past timestamps
 
     The 2018-05-05 North Korea 30-minute time zone change took place
     at 23:30 the previous day, not at 00:00 that day.
@@ -47,7 +47,7 @@ Release 2018e - 2018-05-01 23:42:51 -0700
     'make tarballs' now also builds a rearguard tarball.
     New 's' and 'd' suffixes in SAVE columns of Rule and Zone lines.
 
-  Changes to past and future time stamps
+  Changes to past and future timestamps
 
     North Korea switches back from +0830 to +09 on 2018-05-05.
     (Thanks to Kang Seonghoon, Arthur David Olson, Seo Sanghyeon,
@@ -55,9 +55,9 @@ Release 2018e - 2018-05-01 23:42:51 -0700
 
     Bring back the negative-DST changes of 2018a, except be more
     compatible with data parsers that do not support negative DST.
-    Also, this now affects historical time stamps in Namibia and the
+    Also, this now affects historical timestamps in Namibia and the
     former Czechoslovakia, not just Ireland.  The main format now uses
-    negative DST to model time stamps in Europe/Dublin (from 1971 on),
+    negative DST to model timestamps in Europe/Dublin (from 1971 on),
     Europe/Prague (1946/7), and Africa/Windhoek (1994/2017).  This
     does not affect UT offsets, only time zone abbreviations and the
     tm_isdst flag.  Also, this does not affect rearguard or vanguard
@@ -82,7 +82,7 @@ Release 2018e - 2018-05-01 23:42:51 -0700
     in tzdata, it could be used to specify the legal time in Namibia
     1994-2017, as opposed to the popular time (see below).
 
-  Changes to past time stamps
+  Changes to past timestamps
 
     From 1994 through 2017 Namibia observed DST in winter, not summer.
     That is, it used negative DST, as Ireland still does.  This change
@@ -110,17 +110,17 @@ Release 2018d - 2018-03-22 07:05:46 -0700
   Add support for vanguard and rearguard data consumers.
   Add subsecond precision to source data format, though not to data.
 
-  Changes to future time stamps
+  Changes to future timestamps
 
     In 2018, Palestine starts DST on March 24, not March 31.
     Adjust future predictions accordingly.  (Thanks to Sharef Mustafa.)
 
-  Changes to past and future time stamps
+  Changes to past and future timestamps
 
     Casey Station in Antarctica changed from +11 to +08 on 2018-03-11
     at 04:00.  (Thanks to Steffen Thorsen.)
 
-  Changes to past time stamps
+  Changes to past timestamps
 
     Historical transitions for Uruguay, represented by
     America/Montevideo, have been updated per official legal documents,
@@ -262,7 +262,7 @@ Release 2018c - 2018-01-22 23:00:44 -0800
     change is reapplied.  (Problems reported by Deborah Goldsmith and
     Stephen Colebourne.)
 
-  Changes to past time stamps
+  Changes to past timestamps
 
     Japanese DST transitions (1948-1951) were Sundays at 00:00, not
     Saturdays or Sundays at 02:00.  (Thanks to Takayuki Nikai.)
@@ -294,18 +294,18 @@ Release 2018a - 2018-01-12 22:29:21 -0800
   Use Debian-style installation locations, instead of 4.3BSD-style.
   New zic option -t.
 
-  Changes to past and future time stamps
+  Changes to past and future timestamps
 
     São Tomé and Príncipe switched from +00 to +01 on 2018-01-01 at
     01:00.  (Thanks to Steffen Thorsen and Michael Deckers.)
 
-  Changes to future time stamps
+  Changes to future timestamps
 
     Starting in 2018 southern Brazil will begin DST on November's
     first Sunday instead of October's third Sunday.  (Thanks to
     Steffen Thorsen.)
 
-  Changes to past time stamps
+  Changes to past timestamps
 
     A discrepancy of 4 s in timestamps before 1931 in South Sudan has
     been corrected.  The 'backzone' and 'zone.tab' files did not agree
@@ -393,7 +393,7 @@ Release 2017c - 2017-10-20 14:49:34 -0700
   A new file tzdata.zi now holds a small text copy of all data.
   The zic input format has been regularized slightly.
 
-  Changes to future time stamps
+  Changes to future timestamps
 
     Northern Cyprus has decided to resume EU rules starting
     2017-10-29, thus reinstituting winter time.
@@ -419,7 +419,7 @@ Release 2017c - 2017-10-20 14:49:34 -0700
     2018-03-11 at 03:00.  This affects UT offsets starting 2018-11-04
     at 02:00.  (Thanks to Steffen Thorsen.)
 
-  Changes to past time stamps
+  Changes to past timestamps
 
     Namibia switched from +02 to +01 on 1994-03-21, not 1994-04-03.
     (Thanks to Arthur David Olson.)
@@ -549,11 +549,11 @@ Release 2017b - 2017-03-17 07:30:38 -0700
 
   Briefly: Haiti has resumed DST.
 
-  Changes to past and future time stamps
+  Changes to past and future timestamps
 
     Haiti resumed observance of DST in 2017.  (Thanks to Steffen Thorsen.)
 
-  Changes to past time stamps
+  Changes to past timestamps
 
     Liberia changed from -004430 to +00 on 1972-01-07, not 1972-05-01.
 
@@ -576,7 +576,7 @@ Release 2017a - 2017-02-28 00:05:36 -0800
   Briefly: Southern Chile moves from -04/-03 to -03, and Mongolia
   discontinues DST.
 
-  Changes to future time stamps
+  Changes to future timestamps
 
     Mongolia no longer observes DST.  (Thanks to Ganbold Tsagaankhuu.)
 
@@ -587,12 +587,12 @@ Release 2017a - 2017-02-28 00:05:36 -0800
     assume it's permanent.  (Thanks to Juan Correa and Deborah
     Goldsmith.)  This also affects Antarctica/Palmer.
 
-  Changes to past time stamps
+  Changes to past timestamps
 
-    Fix many entries for historical time stamps for Europe/Madrid
+    Fix many entries for historical timestamps for Europe/Madrid
     before 1979, to agree with tables compiled by Pere Planesas of the
     National Astronomical Observatory of Spain.  As a side effect,
-    this changes some time stamps for Africa/Ceuta before 1929, which
+    this changes some timestamps for Africa/Ceuta before 1929, which
     are probably guesswork anyway.  (Thanks to Steve Allen and
     Pierpaolo Bernardi for the heads-ups, and to Michael Deckers for
     correcting the 1901 transition.)
@@ -683,13 +683,13 @@ Release 2016j - 2016-11-22 23:17:13 -0800
 
   Briefly: Saratov, Russia moves from +03 to +04 on 2016-12-04.
 
-  Changes to future time stamps
+  Changes to future timestamps
 
     Saratov, Russia switches from +03 to +04 on 2016-12-04 at 02:00.
     This hives off a new zone Europe/Saratov from Europe/Volgograd.
     (Thanks to Yuri Konotopov and Stepan Golosunov.)
 
-  Changes to past time stamps
+  Changes to past timestamps
 
     The new zone Asia/Atyrau for Atyraū Region, Kazakhstan, is like
     Asia/Aqtau except it switched from +05/+06 to +04/+05 in spring
@@ -725,7 +725,7 @@ Release 2016i - 2016-11-01 23:19:52 -0700
   Briefly: Cyprus split into two time zones on 2016-10-30, and Tonga
   reintroduces DST on 2016-11-06.
 
-  Changes to future time stamps
+  Changes to future timestamps
 
     Pacific/Tongatapu begins DST on 2016-11-06 at 02:00, ending on
     2017-01-15 at 03:00.  Assume future observances in Tonga will be
@@ -733,7 +733,7 @@ Release 2016i - 2016-11-01 23:19:52 -0700
     January, like Fiji.  (Thanks to Pulu ʻAnau.)  Switch to numeric
     time zone abbreviations for this zone.
 
-  Changes to past and future time stamps
+  Changes to past and future timestamps
 
     Northern Cyprus is now +03 year round, causing a split in Cyprus
     time zones starting 2016-10-30 at 04:00.  This creates a zone
@@ -742,9 +742,9 @@ Release 2016i - 2016-11-01 23:19:52 -0700
     Antarctica/Casey switched from +08 to +11 on 2016-10-22.
     (Thanks to Steffen Thorsen.)
 
-  Changes to past time stamps
+  Changes to past timestamps
 
-    Several corrections were made for pre-1975 time stamps in Italy.
+    Several corrections were made for pre-1975 timestamps in Italy.
     These affect Europe/Malta, Europe/Rome, Europe/San_Marino, and
     Europe/Vatican.
 
@@ -782,7 +782,7 @@ Release 2016i - 2016-11-01 23:19:52 -0700
 
 Release 2016h - 2016-10-19 23:17:57 -0700
 
-  Changes to future time stamps
+  Changes to future timestamps
 
     Asia/Gaza and Asia/Hebron end DST on 2016-10-29 at 01:00, not
     2016-10-21 at 00:00.  (Thanks to Sharef Mustafa.)  Predict that
@@ -790,7 +790,7 @@ Release 2016h - 2016-10-19 23:17:57 -0700
     at 01:00, which is consistent with predicted spring transitions
     on the last Saturday of March.  (Thanks to Tim Parenti.)
 
-  Changes to past time stamps
+  Changes to past timestamps
 
     In Turkey, transitions in 1986-1990 were at 01:00 standard time
     not at 02:00, and the spring 1994 transition was on March 20, not
@@ -839,7 +839,7 @@ Release 2016h - 2016-10-19 23:17:57 -0700
 
 Release 2016g - 2016-09-13 08:56:38 -0700
 
-  Changes to future time stamps
+  Changes to future timestamps
 
     Turkey switched from EET/EEST (+02/+03) to permanent +03,
     effective 2016-09-07.  (Thanks to Burak AYDIN.)  Use "+03" rather
@@ -848,7 +848,7 @@ Release 2016g - 2016-09-13 08:56:38 -0700
     New leap second 2016-12-31 23:59:60 UTC as per IERS Bulletin C 52.
     (Thanks to Tim Parenti.)
 
-  Changes to past time stamps
+  Changes to past timestamps
 
     For America/Los_Angeles, spring-forward transition times have been
     corrected from 02:00 to 02:01 in 1948, and from 02:00 to 01:00 in
@@ -897,9 +897,9 @@ Release 2016g - 2016-09-13 08:56:38 -0700
     zic no longer generates binary files containing POSIX TZ-like
     strings that disagree with the local time type after the last
     explicit transition in the data.  This fixes a bug with
-    Africa/Casablanca and Africa/El_Aaiun in some year-2037 time
-    stamps on the reference platform.  (Thanks to Alexander Belopolsky
-    for reporting the bug and suggesting a way forward.)
+    Africa/Casablanca and Africa/El_Aaiun in some year-2037 timestamps
+    on the reference platform.  (Thanks to Alexander Belopolsky for
+    reporting the bug and suggesting a way forward.)
 
     If the installed localtime and/or posixrules files are symbolic
     links, zic now keeps them symbolic links when updating them, for
@@ -962,7 +962,7 @@ Release 2016g - 2016-09-13 08:56:38 -0700
 
 Release 2016f - 2016-07-05 16:26:51 +0200
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     The Egyptian government changed its mind on short notice, and
     Africa/Cairo will not introduce DST starting 2016-07-07 after all.
@@ -971,12 +971,12 @@ Release 2016f - 2016-07-05 16:26:51 +0200
     Asia/Novosibirsk switches from +06 to +07 on 2016-07-24 at 02:00.
     (Thanks to Stepan Golosunov.)
 
-  Changes to past and future time stamps
+  Changes to past and future timestamps
 
     Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
     abbreviations instead of invented ones.
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     Europe/Minsk's 1992-03-29 spring-forward transition was at 02:00 not 00:00.
     (Thanks to Stepan Golosunov.)
@@ -984,14 +984,14 @@ Release 2016f - 2016-07-05 16:26:51 +0200
 
 Release 2016e - 2016-06-14 08:46:16 -0700
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     Africa/Cairo observes DST in 2016 from July 7 to the end of October.
     Guess October 27 and 24:00 transitions.  (Thanks to Steffen Thorsen.)
     For future years, guess April's last Thursday to October's last
     Thursday except for Ramadan.
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     Locations while uninhabited now use '-00', not 'zzz', as a
     placeholder time zone abbreviation.  This is inspired by Internet
@@ -1020,7 +1020,7 @@ Release 2016e - 2016-06-14 08:46:16 -0700
 
 Release 2016d - 2016-04-17 22:50:29 -0700
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     America/Caracas switches from -0430 to -04 on 2016-05-01 at 02:30.
     (Thanks to Alexander Krivenyshev for the heads-up.)
@@ -1032,7 +1032,7 @@ Release 2016d - 2016-04-17 22:50:29 -0700
     Tomsk Oblast, Russia, which switches from +06 to +07 on 2016-05-29
     at 02:00.  (Thanks to Stepan Golosunov.)
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     New zone Europe/Kirov, split off from Europe/Volgograd.  It covers
     Kirov Oblast, Russia, which switched from +04/+05 to +03/+04 on
@@ -1055,7 +1055,7 @@ Release 2016d - 2016-04-17 22:50:29 -0700
 
 Release 2016c - 2016-03-23 00:51:27 -0700
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     Azerbaijan no longer observes DST.  (Thanks to Steffen Thorsen.)
 
@@ -1066,7 +1066,7 @@ Release 2016c - 2016-03-23 00:51:27 -0700
     2014-09-07 through 2016-05-14 daylight saving time instead of
     standard time, as that seems more appropriate now.
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     Europe/Kaliningrad and Europe/Vilnius changed from +03/+04 to
     +02/+03 on 1989-03-26, not 1991-03-31.  Europe/Volgograd changed
@@ -1091,7 +1091,7 @@ Release 2016b - 2016-03-12 17:30:14 -0800
     POSIX.1-1988 that was removed in POSIX.1-2001.  One way to suppress the
     warnings is to upgrade to zic derived from tz releases 2015f and later.
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     New zones Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and
     Ulyanovsk Oblasts, Russia, both of which will switch from +03 to +04 on
@@ -1115,7 +1115,7 @@ Release 2016b - 2016-03-12 17:30:14 -0800
     (Thanks to Hannah Kreitem.) Guess future transitions will be March's last
     Saturday at 01:00, not March's last Friday at 24:00.
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     Europe/Chisinau observed DST during 1990, and switched from +04 to
     +03 at 1990-05-06 02:00, instead of switching from +03 to +02.
@@ -1150,7 +1150,7 @@ Release 2016b - 2016-03-12 17:30:14 -0800
 
 Release 2016a - 2016-01-26 23:28:02 -0800
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     America/Cayman will not observe daylight saving this year after all.
     Revert our guess that it would.  (Thanks to Matt Johnson.)
@@ -1162,7 +1162,7 @@ Release 2016a - 2016-01-26 23:28:02 -0800
     to be March 21 00:00 to September 21 00:00.  This is likely better
     than predicting no DST, albeit off by a day every now and then.
 
-  Changes affecting past and future time stamps
+  Changes affecting past and future timestamps
 
     America/Metlakatla switched from PST all year to AKST/AKDT on
     2015-11-01 at 02:00.  (Thanks to Steffen Thorsen.)
@@ -1171,7 +1171,7 @@ Release 2016a - 2016-01-26 23:28:02 -0800
     backward compatibility link to America/Tijuana.  Its contents were
     apparently based on a misreading of Mexican legislation.
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     Asia/Karachi's two transition times in 2002 were off by a minute.
     (Thanks to Matt Johnson.)
@@ -1205,7 +1205,7 @@ Release 2016a - 2016-01-26 23:28:02 -0800
 
 Release 2015g - 2015-10-01 00:39:51 -0700
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.
     (Thanks to Fatih.)
@@ -1220,7 +1220,7 @@ Release 2015g - 2015-10-01 00:39:51 -0700
     effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
     New zone America/Fort_Nelson.  (Thanks to Matt Johnson.)
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     Norfolk observed DST from 1974-10-27 02:00 to 1975-03-02 02:00.
 
@@ -1250,7 +1250,7 @@ Release 2015g - 2015-10-01 00:39:51 -0700
 
 Release 2015f - 2015-08-10 18:06:56 -0700
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     North Korea switches to +0830 on 2015-08-15.  (Thanks to Steffen Thorsen.)
     The abbreviation remains "KST".  (Thanks to Robert Elz.)
@@ -1258,7 +1258,7 @@ Release 2015f - 2015-08-10 18:06:56 -0700
     Uruguay no longer observes DST.  (Thanks to Steffen Thorsen
     and Pablo Camargo.)
 
-  Changes affecting past and future time stamps
+  Changes affecting past and future timestamps
 
     Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.
     (Thanks to Roman Tudos.)
@@ -1317,7 +1317,7 @@ Release 2015f - 2015-08-10 18:06:56 -0700
 
 Release 2015e - 2015-06-13 10:56:02 -0700
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
     not 06-13 and 07-18 as we had guessed.  (Thanks to Milamber.)
@@ -1345,13 +1345,13 @@ Release 2015e - 2015-06-13 10:56:02 -0700
 
 Release 2015d - 2015-04-24 08:09:46 -0700
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     Egypt will not observe DST in 2015 and will consider canceling it
     permanently.  For now, assume no DST indefinitely.
     (Thanks to Ahmed Nazmy and Tim Parenti.)
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     America/Whitehorse switched from UT -09 to -08 on 1967-05-28, not
     1966-07-01.  Also, Yukon's time zone history is documented better.
@@ -1371,16 +1371,16 @@ Release 2015d - 2015-04-24 08:09:46 -0700
 
 Release 2015c - 2015-04-11 08:55:55 -0700
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     Egypt's spring-forward transition is at 24:00 on April's last Thursday,
     not 00:00 on April's last Friday.  2015's transition will therefore be on
     Thursday, April 30 at 24:00, not Friday, April 24 at 00:00.  Similar fixes
     apply to 2026, 2037, 2043, etc.  (Thanks to Steffen Thorsen.)
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
-    The following changes affect some pre-1991 Chile-related time stamps
+    The following changes affect some pre-1991 Chile-related timestamps
     in America/Santiago, Antarctica/Palmer, and Pacific/Easter.
 
       The 1910 transition was January 10, not January 1.
@@ -1405,8 +1405,8 @@ Release 2015c - 2015-04-11 08:55:55 -0700
       since we have no data suggesting that they existed.
 
     One more zone has been turned into a link, as it differed
-    from an existing zone only for older time stamps.  As usual,
-    this change affects UT offsets in pre-1970 time stamps only.
+    from an existing zone only for older timestamps.  As usual,
+    this change affects UT offsets in pre-1970 timestamps only.
     The zone's old contents have been moved to the 'backzone' file.
     The affected zone is America/Montreal.
 
@@ -1419,7 +1419,7 @@ Release 2015c - 2015-04-11 08:55:55 -0700
 
 Release 2015b - 2015-03-19 23:28:11 -0700
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     Mongolia will start observing DST again this year, from the last
     Saturday in March at 02:00 to the last Saturday in September at 00:00.
@@ -1429,14 +1429,14 @@ Release 2015b - 2015-03-19 23:28:11 -0700
     correct the fall 2014 transition from September 26 to October 24.
     Adjust future predictions accordingly.  (Thanks to Steffen Thorsen.)
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     The 1982 zone shift in Pacific/Easter has been corrected, fixing a 2015a
     regression.  (Thanks to Stuart Bishop for reporting the problem.)
 
     Some more zones have been turned into links, when they differed
-    from existing zones only for older time stamps.  As usual,
-    these changes affect UT offsets in pre-1970 time stamps only.
+    from existing zones only for older timestamps.  As usual,
+    these changes affect UT offsets in pre-1970 timestamps only.
     Their old contents have been moved to the 'backzone' file.
     The affected zones are: America/Antigua, America/Cayman,
     Pacific/Midway, and Pacific/Saipan.
@@ -1467,7 +1467,7 @@ Release 2015b - 2015-03-19 23:28:11 -0700
 
 Release 2015a - 2015-01-29 22:35:20 -0800
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     The Mexican state of Quintana Roo, represented by America/Cancun,
     will shift from Central Time with DST to Eastern Time without DST
@@ -1480,15 +1480,15 @@ Release 2015a - 2015-01-29 22:35:20 -0800
     New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49.
     (Thanks to Tim Parenti.)
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     Iceland observed DST in 1919 and 1921, and its 1939 fallback
     transition was Oct. 29, not Nov. 29.  Remove incorrect data from
     Shanks about time in Iceland between 1837 and 1908.
 
     Some more zones have been turned into links, when they differed
-    from existing zones only for older time stamps.  As usual,
-    these changes affect UT offsets in pre-1970 time stamps only.
+    from existing zones only for older timestamps.  As usual,
+    these changes affect UT offsets in pre-1970 timestamps only.
     Their old contents have been moved to the 'backzone' file.
     The affected zones are: Asia/Aden, Asia/Bahrain, Asia/Kuwait,
     and Asia/Muscat.
@@ -1519,23 +1519,23 @@ Release 2015a - 2015-01-29 22:35:20 -0800
 
 Release 2014j - 2014-11-10 17:37:11 -0800
 
-  Changes affecting current and future time stamps
+  Changes affecting current and future timestamps
 
     Turks & Caicos' switch from US eastern time to UT -04 year-round
     did not occur on 2014-11-02 at 02:00.  It's currently scheduled
     for 2015-11-01 at 02:00.  (Thanks to Chris Walton.)
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
-    Many pre-1989 time stamps have been corrected for Asia/Seoul and
+    Many pre-1989 timestamps have been corrected for Asia/Seoul and
     Asia/Pyongyang, based on sources for the Korean-language Wikipedia
     entry for time in Korea.  (Thanks to Sanghyuk Jung.)  Also, no
     longer guess that Pyongyang mimicked Seoul time after World War II,
     as this is politically implausible.
 
     Some more zones have been turned into links, when they differed
-    from existing zones only for older time stamps.  As usual,
-    these changes affect UT offsets in pre-1970 time stamps only.
+    from existing zones only for older timestamps.  As usual,
+    these changes affect UT offsets in pre-1970 timestamps only.
     Their old contents have been moved to the 'backzone' file.
     The affected zones are: Africa/Addis_Ababa, Africa/Asmara,
     Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala,
@@ -1550,7 +1550,7 @@ Release 2014j - 2014-11-10 17:37:11 -0800
 
 Release 2014i - 2014-10-21 22:04:57 -0700
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     Pacific/Fiji will observe DST from 2014-11-02 02:00 to 2015-01-18 03:00.
     (Thanks to Ken Rylander for the heads-up.)  Guess that future
@@ -1570,17 +1570,17 @@ Release 2014i - 2014-10-21 22:04:57 -0700
     The new abbreviation IDT stands for the pre-1976 use of UT +08 in
     Indochina, to distinguish it better from ICT (+07).
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
-    Many time stamps have been corrected for Asia/Ho_Chi_Minh before 1976
+    Many timestamps have been corrected for Asia/Ho_Chi_Minh before 1976
     (thanks to Trần Ngọc Quân for an indirect pointer to Trần Tiến Bình's
     authoritative book).  Asia/Ho_Chi_Minh has been added to
     zone1970.tab, to give tzselect users in Vietnam two choices,
     since north and south Vietnam disagreed after our 1970 cutoff.
 
     Asia/Phnom_Penh and Asia/Vientiane have been turned into links, as
-    they differed from existing zones only for older time stamps.  As
-    usual, these changes affect pre-1970 time stamps only.  Their old
+    they differed from existing zones only for older timestamps.  As
+    usual, these changes affect pre-1970 timestamps only.  Their old
     contents have been moved to the 'backzone' file.
 
   Changes affecting code
diff --git a/asia b/asia
index 9e3bf6d..49abd75 100644
--- a/asia
+++ b/asia
@@ -1989,7 +1989,7 @@ Zone	Asia/Aqtobe	3:48:40	-	LMT	1924 May  2
 			5:00	-	+05
 # Mangghystaū (KZ-MAN)
 # Aqtau was not founded until 1963, but it represents an inhabited region,
-# so include time stamps before 1963.
+# so include timestamps before 1963.
 Zone	Asia/Aqtau	3:21:04	-	LMT	1924 May  2
 			4:00	-	+04	1930 Jun 21
 			5:00	-	+05	1981 Oct  1
diff --git a/backzone b/backzone
index d1fd83b..97792b1 100644
--- a/backzone
+++ b/backzone
@@ -16,13 +16,13 @@
 # the file 'backward'.
 
 # Although zones in this file may be of some use for analyzing
-# pre-1970 time stamps, they are less reliable, cover only a tiny
+# pre-1970 timestamps, they are less reliable, cover only a tiny
 # sliver of the pre-1970 era, and cannot feasibly be improved to cover
 # most of the era.  Because the zones are out of normal scope for the
 # database, less effort is put into maintaining this file.  Many of
 # the zones were formerly in other source files, but were removed or
 # replaced by links as their data entries were questionable and/or they
-# differed from other zones only in pre-1970 time stamps.
+# differed from other zones only in pre-1970 timestamps.
 
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
diff --git a/europe b/europe
index ed5ebb3..8a8f8f9 100644
--- a/europe
+++ b/europe
@@ -517,7 +517,7 @@ Link	Europe/London	Europe/Isle_of_Man
 #
 # To work around this problem, the build procedure can translate the
 # following data into two forms, one with negative SAVE values and the
-# other form with a traditional approximation for Irish time stamps
+# other form with a traditional approximation for Irish timestamps
 # after 1971-10-31 02:00 UTC; although this approximation has tm_isdst
 # flags that are reversed, its UTC offsets are correct and this often
 # suffices.  This source file currently uses only nonnegative SAVE
@@ -3610,7 +3610,7 @@ Zone	Europe/Zurich	0:34:08 -	LMT	1853 Jul 16 # See above comment.
 # http://www.resmigazete.gov.tr/eskiler/2001/03/20010324.htm#2  - for 2001
 # http://www.resmigazete.gov.tr/eskiler/2002/03/20020316.htm#2  - for 2002-2006
 # From Paul Eggert (2016-09-25):
-# Prefer the above sources to Shanks & Pottenger for time stamps after 1985.
+# Prefer the above sources to Shanks & Pottenger for timestamps after 1985.
 
 # From Steffen Thorsen (2007-03-09):
 # Starting 2007 though, it seems that they are adopting EU's 1:00 UTC
diff --git a/southamerica b/southamerica
index 9784044..aab355c 100644
--- a/southamerica
+++ b/southamerica
@@ -392,7 +392,7 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	-
 # standard time, so let's do that here too.  This does not change UTC
 # offsets, only tm_isdst and the time zone abbreviations.  One minor
 # plus is that this silences a zic complaint that there's no POSIX TZ
-# setting for time stamps past 2038.
+# setting for timestamps past 2038.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
diff --git a/theory.html b/theory.html
index 2f57ea2..deaa900 100644
--- a/theory.html
+++ b/theory.html
@@ -1224,7 +1224,7 @@ Coordinated Time (<abbr>MTC</abbr>)</a>.
 
 <p>
 Each landed mission on Mars has adopted a different reference for
-solar time keeping, so there is no real standard for Mars time zones.
+solar timekeeping, so there is no real standard for Mars time zones.
 For example, the
 <a href="https://en.wikipedia.org/wiki/Mars_Exploration_Rover">Mars
 Exploration Rover</a> project (2004) defined two time zones "Local
diff --git a/tz-link.html b/tz-link.html
index d307bf7..d343569 100644
--- a/tz-link.html
+++ b/tz-link.html
@@ -87,7 +87,7 @@ Associated with each region is a history of offsets from
 Time</a> (<abbr>UT</abbr>), which is <a
 href="https://en.wikipedia.org/wiki/Greenwich_Mean_Time">Greenwich Mean
 Time</a> (<abbr>GMT</abbr>) with days beginning at midnight;
-for time stamps after 1960 this is more precisely <a
+for timestamps after 1960 this is more precisely <a
 href="https://en.wikipedia.org/wiki/Coordinated_Universal_Time">Coordinated
 Universal Time</a> (<abbr>UTC</abbr>).
 The database also records when daylight saving time was in use,
@@ -149,7 +149,7 @@ The code lets you compile the <code><abbr>tz</abbr></code> source files into
 machine-readable binary files, one for each location. The binary files
 are in a special time zone information format (<dfn><abbr>TZif</abbr></dfn>).
 The code also lets
-you read a <abbr>TZif</abbr> file and interpret time stamps for that
+you read a <abbr>TZif</abbr> file and interpret timestamps for that
 location.</p>
 <h2 id="changes">Changes to the <code><abbr>tz</abbr></code> database</h2>
 <p>
@@ -465,7 +465,7 @@ is a <abbr>TZif</abbr> file reader written in Java.
 It is freely available under the <abbr>LGPL</abbr>.</li>
 <li><a href="https://github.com/derickr/timelib">Timelib</a> is a C
 library that reads <abbr>TZif</abbr> files and converts
-time stamps from one time zone or format to another.
+timestamps from one time zone or format to another.
 It is used by <a href="https://secure.php.net"><abbr
 title="PHP: Hypertext Preprocessor">PHP</abbr></a>,
 <a href="https://hhvm.com"><abbr title="HipHop Virtual Machine">HHVM</abbr></a>,
@@ -929,7 +929,7 @@ but in China it denotes 8 hours ahead of <abbr>UT</abbr>,
 and French-speaking North Americans prefer
 "<abbr title="Heure Normale du Centre">HNC</abbr>" to
 "<abbr>CST</abbr>". The <code><abbr>tz</abbr></code>
-database contains English abbreviations for many time stamps;
+database contains English abbreviations for many timestamps;
 unfortunately some of these abbreviations were merely the database maintainers'
 inventions, and these have been removed when possible.</li>
 <li>Numeric time zone abbreviations typically count hours east of
@@ -943,7 +943,7 @@ for Japan and Hawaii, respectively. If the
 <code><abbr>tz</abbr></code> database is available, it is usually better to use
 settings like <code><abbr>TZ</abbr>="Asia/Tokyo"</code> and
 <code><abbr>TZ</abbr>="Pacific/Honolulu"</code> instead, as this should avoid
-confusion, handle old time stamps better, and insulate you better from
+confusion, handle old timestamps better, and insulate you better from
 any future changes to the rules. One should never set
 <abbr>POSIX</abbr> <code><abbr>TZ</abbr></code> to a value like
 <code>"GMT-9"</code>, though, since this would incorrectly imply that
diff --git a/zdump.8 b/zdump.8
index ef611db..833dd54 100644
--- a/zdump.8
+++ b/zdump.8
@@ -212,13 +212,13 @@ output,
 .q "UT"
 denotes the value returned by
 .IR gmtime (3),
-which uses UTC for modern time stamps and some other UT flavor for
-time stamps that predate the introduction of UTC.
+which uses UTC for modern timestamps and some other UT flavor for
+timestamps that predate the introduction of UTC.
 No attempt is currently made to have the output use
 .q "UTC"
 for newer and
 .q "UT"
-for older time stamps, partly because the exact date of the
+for older timestamps, partly because the exact date of the
 introduction of UTC is problematic.
 .SH "SEE ALSO"
 newctime(3), tzfile(5), zic(8)
diff --git a/zic.8 b/zic.8
index ee590fa..ba4796e 100644
--- a/zic.8
+++ b/zic.8
@@ -103,7 +103,7 @@ represented.
 The output contains data that may not be handled properly by client
 code designed for older
 .I zic
-output formats.  These compatibility issues affect only time stamps
+output formats.  These compatibility issues affect only timestamps
 before 1970 or after the start of 2038.
 .PP
 A time zone abbreviation has fewer than 3 characters.
@@ -592,9 +592,9 @@ To get separate transitions
 use multiple zone continuation lines
 specifying transition instants using universal time.
 .PP
-Time stamps well before the Big Bang are silently omitted from the output.
+timestamps well before the Big Bang are silently omitted from the output.
 This works around bugs in software that mishandles large negative time
-stamps.  Call it sour grapes, but pre-Big-Bang time stamps are
+stamps.  Call it sour grapes, but pre-Big-Bang timestamps are
 physically suspect anyway.  The pre-Big-Bang cutoff time is
 approximate and may change in future versions.
 .SH FILES
diff --git a/zic.c b/zic.c
index f1d0bf3..7c04435 100644
--- a/zic.c
+++ b/zic.c
@@ -974,8 +974,8 @@ static zic_t const max_time = MAXVAL(zic_t, TIME_T_BITS_IN_FILE);
 
 /* If true, work around GNOME bug 730332
    <https://bugzilla.gnome.org/show_bug.cgi?id=730332>
-   by refusing to output time stamps before BIG_BANG.
-   Such time stamps are physically suspect anyway.
+   by refusing to output timestamps before BIG_BANG.
+   Such timestamps are physically suspect anyway.
 
    The GNOME bug is scheduled to be fixed in GNOME 3.22, and if so
    this workaround will no longer be needed when GNOME 3.21 and
@@ -1826,7 +1826,7 @@ writezone(const char *const name, const char *const string, char version)
 		types[i] = attypes[i].type;
 	}
 
-	/* Work around QTBUG-53071 for time stamps less than y2038_boundary - 1,
+	/* Work around QTBUG-53071 for timestamps less than y2038_boundary - 1,
 	   by inserting a no-op transition at time y2038_boundary - 1.
 	   This works only for timestamps before the boundary, which
 	   should be good enough in practice as QTBUG-53071 should be
diff --git a/zone1970.tab b/zone1970.tab
index 91d7a57..9d6d4fa 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -4,7 +4,7 @@
 #
 # From Paul Eggert (2017-10-01):
 # This file contains a table where each row stands for a zone where
-# civil time stamps have agreed since 1970.  Columns are separated by
+# civil timestamps have agreed since 1970.  Columns are separated by
 # a single tab.  Lines beginning with '#' are comments.  All text uses
 # UTF-8 encoding.  The columns of the table are as follows:
 #
-- 
2.17.0




More information about the tz mailing list