Prefer "timestamp" to "time stamp"

* NEWS, newctime.3, strftime.c, tz-art.htm, zdump.c:
POSIX calls them "timestamps" not "time stamps", so standardize
on the POSIX spelling.

NEWS

@@ -1019,16 +1019,16 @@ Release 2014i - 2014-10-21 22:04:57 -0700
     been fixed.  (Thanks to Christos Zoulas for reporting most of
     these problems and for suggesting fixes.)
 
-    If USG_COMPAT is defined and the requested time stamp is standard time,
+    If USG_COMPAT is defined and the requested timestamp is standard time,
     the tz library's localtime and mktime functions now set the extern
-    variable timezone to a value appropriate for that time stamp; and
+    variable timezone to a value appropriate for that timestamp; and
     similarly for ALTZONE, daylight saving time, and the altzone variable.
     This change is a companion to the tzname change in 2014h, and is
     designed to make timezone and altzone more compatible with tzname.
 
     The tz library's functions now set errno to EOVERFLOW if they fail
     because the result cannot be represented.  ctime and ctime_r now
-    return NULL and set errno when a time stamp is out of range, rather
+    return NULL and set errno when a timestamp is out of range, rather
     than having undefined behavior.
 
     Some bugs associated with the new 2014g functions have been fixed.
@@ -1045,7 +1045,7 @@ Release 2014i - 2014-10-21 22:04:57 -0700
 
 Release 2014h - 2014-09-25 18:59:03 -0700
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28.
 
@@ -1053,8 +1053,8 @@ Release 2014h - 2014-09-25 18:59:03 -0700
     not 1920-01-06.  The old entry was based on a misinterpretation of Shanks.
 
     Some more zones have been turned into links, when they differed
-    from existing zones only for older time stamps.  As usual,
-    these changes affect UTC offsets in pre-1970 time stamps only.
+    from existing zones only for older timestamps.  As usual,
+    these changes affect UTC offsets in pre-1970 timestamps only.
     Their old contents have been moved to the 'backzone' file.
     The affected zones are: Africa/Blantyre, Africa/Bujumbura,
     Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi,
@@ -1066,7 +1066,7 @@ Release 2014h - 2014-09-25 18:59:03 -0700
     not merely on platforms defining TM_GMTOFF.
 
     The tz library's localtime and mktime functions now set tzname to a value
-    appropriate for the requested time stamp, and zdump now uses this
+    appropriate for the requested timestamp, and zdump now uses this
     on platforms not defining TM_ZONE, fixing a 2014g regression.
     (Thanks to Tim Parenti for reporting the problem.)
 
@@ -1106,13 +1106,13 @@ Release 2014h - 2014-09-25 18:59:03 -0700
 
 Release 2014g - 2014-08-28 12:31:23 -0700
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     Turks & Caicos is switching from US eastern time to UT -04
     year-round, modeled as a switch on 2014-11-02 at 02:00.
     [As noted in 2014j, this switch was later delayed.]
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     Time in Russia or the USSR before 1926 or so has been corrected by
     a few seconds in the following zones: Asia/Irkutsk,
@@ -1122,7 +1122,7 @@ Release 2014g - 2014-08-28 12:31:23 -0700
     Vladimir Karpinsky.)
 
     The Portuguese decree of 1911-05-26 took effect on 1912-01-01.
-    This affects 1911 time stamps in Africa/Bissau, Africa/Luanda,
+    This affects 1911 timestamps in Africa/Bissau, Africa/Luanda,
     Atlantic/Azores, and Atlantic/Madeira.  Also, Lisbon's pre-1912
     GMT offset was -0:36:45 (rounded from -0:36:44.68), not -0:36:32.
     (Thanks to Stephen Colebourne for pointing to the decree.)
@@ -1130,7 +1130,7 @@ Release 2014g - 2014-08-28 12:31:23 -0700
     Asia/Dhaka ended DST on 2009-12-31 at 24:00, not 23:59.
 
     A new file 'backzone' contains data which may appeal to
-    connoisseurs of old time stamps, although it is out of scope for
+    connoisseurs of old timestamps, although it is out of scope for
     the tz database, is often poorly sourced, and contains some data
     that is known to be incorrect.  The new file is not recommended
     for ordinary use and its entries are not installed by default.
@@ -1138,8 +1138,8 @@ Release 2014g - 2014-08-28 12:31:23 -0700
     Isle of Man entries.)
 
     Some more zones have been turned into links, when they differed
-    from existing zones only for older time stamps.  As usual,
-    these changes affect UTC offsets in pre-1970 time stamps only.
+    from existing zones only for older timestamps.  As usual,
+    these changes affect UTC offsets in pre-1970 timestamps only.
     Their old contents have been moved to the 'backzone' file.
     The affected zones are: Africa/Bangui, Africa/Brazzaville,
     Africa/Douala, Africa/Kinshasa, Africa/Libreville, Africa/Luanda,
@@ -1190,7 +1190,7 @@ Release 2014g - 2014-08-28 12:31:23 -0700
     but does not cause other problems such as traps.
 
     If TM_GMTOFF is defined and UNINIT_TRAP is 0, mktime is now
-    more likely to guess right for ambiguous time stamps near
+    more likely to guess right for ambiguous timestamps near
     transitions where tm_isdst does not change.
 
     If HAVE_STRFTIME_L is defined to 1, the tz library now defines
@@ -1263,7 +1263,7 @@ Release 2014g - 2014-08-28 12:31:23 -0700
 
 Release 2014f - 2014-08-05 17:42:36 -0700
 
-  Changes affecting future time stamps
+  Changes affecting future timestamps
 
     Russia will subtract an hour from most of its time zones on 2014-10-26
     at 02:00 local time.  (Thanks to Alexander Krivenyshev.)
@@ -1314,20 +1314,20 @@ Release 2014f - 2014-08-05 17:42:36 -0700
     These abbreviations are now used for time in Korea, Taiwan,
     and Sakhalin while controlled by Japan.
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     China's five zones have been simplified to two, since the post-1970
     differences in the other three seem to have been imaginary.  The
     zones Asia/Harbin, Asia/Chongqing, and Asia/Kashgar have been
     removed; backwards-compatibility links still work, albeit with
-    different behaviors for time stamps before May 1980.  Asia/Urumqi's
+    different behaviors for timestamps before May 1980.  Asia/Urumqi's
     1980 transition to UT +08 has been removed, so that it is now at
     +06 and not +08.  (Thanks to Luther Ma and to Alois Treindl;
     Treindl sent helpful translations of two papers by Guo Qingsheng.)
 
     Some zones have been turned into links, when they differed from existing
     zones only for older UTC offsets where data entries were likely invented.
-    These changes affect UTC offsets in pre-1970 time stamps only.  This is
+    These changes affect UTC offsets in pre-1970 timestamps only.  This is
     similar to the change in release 2013e, except this time for western
     Africa.  The affected zones are: Africa/Bamako, Africa/Banjul,
     Africa/Conakry, Africa/Dakar, Africa/Freetown, Africa/Lome,
@@ -1472,7 +1472,7 @@ Release 2014f - 2014-08-05 17:42:36 -0700
 
 Release 2014e - 2014-06-12 21:53:52 -0700
 
-  Changes affecting near-future time stamps
+  Changes affecting near-future timestamps
 
     Egypt's 2014 Ramadan-based transitions are June 26 and July 31 at 24:00.
     (Thanks to Imed Chihi.)  Guess that from 2015 on Egypt will temporarily
@@ -1484,7 +1484,7 @@ Release 2014e - 2014-06-12 21:53:52 -0700
     temporarily switch to standard time at 03:00 the last Saturday before
     Ramadan, and back to DST at 02:00 the first Saturday after Ramadan.
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     The abbreviation "MSM" (Moscow Midsummer Time) is now used instead of
     "MSD" for Moscow's double daylight time in summer 1921.  Also, a typo
@@ -1502,7 +1502,7 @@ Release 2014d - 2014-05-27 21:34:40 -0700
 
   Changes affecting code
 
-    zic no longer generates files containing time stamps before the Big Bang.
+    zic no longer generates files containing timestamps before the Big Bang.
     This works around GNOME bug 730332
     <https://bugzilla.gnome.org/show_bug.cgi?id=730332>.
     (Thanks to Leonardo Chiquitto for reporting the bug, and to
@@ -1515,7 +1515,7 @@ Release 2014d - 2014-05-27 21:34:40 -0700
 
 Release 2014c - 2014-05-13 07:44:13 -0700
 
-  Changes affecting near-future time stamps
+  Changes affecting near-future timestamps
 
     Egypt observes DST starting 2014-05-15 at 24:00.
     (Thanks to Ahmad El-Dardiry and Gunther Vermier.)
@@ -1529,7 +1529,7 @@ Release 2014c - 2014-05-13 07:44:13 -0700
   Changes affecting code
 
     zic now generates transitions for minimum time values, eliminating guesswork
-    when handling low-valued time stamps.  (Thanks to Arthur David Olson.)
+    when handling low-valued timestamps.  (Thanks to Arthur David Olson.)
 
     Port to Cygwin sans glibc.  (Thanks to Arthur David Olson.)
 
@@ -1540,7 +1540,7 @@ Release 2014c - 2014-05-13 07:44:13 -0700
 
 Release 2014b - 2014-03-24 21:28:50 -0700
 
-  Changes affecting near-future time stamps
+  Changes affecting near-future timestamps
 
     Crimea switches to Moscow time on 2014-03-30 at 02:00 local time.
     (Thanks to Alexander Krivenyshev.)  Move its zone.tab entry from UA to RU.
@@ -1579,12 +1579,12 @@ Release 2014b - 2014-03-24 21:28:50 -0700
 
 Release 2014a - 2014-03-07 23:30:29 -0800
 
-  Changes affecting near-future time stamps
+  Changes affecting near-future timestamps
 
     Turkey begins DST on 2014-03-31, not 03-30.  (Thanks to Faruk Pasin for
     the heads-up, and to Tim Parenti for simplifying the update.)
 
-  Changes affecting past time stamps
+  Changes affecting past timestamps
 
     Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00.
     (Thanks to Steffen Thorsen.)
@@ -1648,13 +1648,13 @@ Release 2014a - 2014-03-07 23:30:29 -0800
 
 Release 2013i - 2013-12-17 07:25:23 -0800
 
-  Changes affecting near-future time stamps:
+  Changes affecting near-future timestamps:
 
     Jordan switches back to standard time at 00:00 on December 20, 2013.
     The 2006-2011 transition schedule is planned to resume in 2014.
     (Thanks to Steffen Thorsen.)
 
-  Changes affecting past time stamps:
+  Changes affecting past timestamps:
 
     In 2004, Cuba began DST on March 28, not April 4.
     (Thanks to Steffen Thorsen.)
@@ -1678,7 +1678,7 @@ Release 2013i - 2013-12-17 07:25:23 -0800
 
 Release 2013h - 2013-10-25 15:32:32 -0700
 
-  Changes affecting current and future time stamps:
+  Changes affecting current and future timestamps:
 
     Libya has switched its UT offset back to +02 without DST, instead
     of +01 with DST.  (Thanks to Even Scharning.)
@@ -1686,7 +1686,7 @@ Release 2013h - 2013-10-25 15:32:32 -0700
     Western Sahara (Africa/El_Aaiun) uses Morocco's DST rules.
     (Thanks to Gwillim Law.)
 
-  Changes affecting future time stamps:
+  Changes affecting future timestamps:
 
     Acre and (we guess) western Amazonas will switch from UT -04 to -05
     on 2013-11-10.  This affects America/Rio_Branco and America/Eirunepe.
@@ -1737,7 +1737,7 @@ Release 2013h - 2013-10-25 15:32:32 -0700
 
 Release 2013g - 2013-09-30 21:08:26 -0700
 
-  Changes affecting current and near-future time stamps
+  Changes affecting current and near-future timestamps
 
     Morocco now observes DST from the last Sunday in March to the last
     Sunday in October, not April to September respectively.  (Thanks
@@ -1770,7 +1770,7 @@ Release 2013g - 2013-09-30 21:08:26 -0700
 
 Release 2013f - 2013-09-24 23:37:36 -0700
 
-  Changes affecting near-future time stamps
+  Changes affecting near-future timestamps
 
     Tocantins will very likely not observe DST starting this spring.
     (Thanks to Steffen Thorsen.)
@@ -1817,7 +1817,7 @@ Release 2013f - 2013-09-24 23:37:36 -0700
 
 Release 2013e - 2013-09-19 23:50:04 -0700
 
-  Changes affecting near-future time stamps
+  Changes affecting near-future timestamps
 
     This year Fiji will start DST on October 27, not October 20.
     (Thanks to David Wheeler for the heads-up.)  For now, guess that
@@ -1835,13 +1835,13 @@ Release 2013e - 2013-09-19 23:50:04 -0700
     Use ART (UT -03, standard time), rather than WARST (also -03, but
     daylight saving time) for San Luis, Argentina since 2009.
 
-  Changes affecting Godthåb time stamps after 2037 if version mismatch
+  Changes affecting Godthåb timestamps after 2037 if version mismatch
 
     Allow POSIX-like TZ strings where the transition time's hour can
     range from -167 through 167, instead of the POSIX-required 0
     through 24.  E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the
     new Fiji rules.  This is a more-compact way to represent
-    far-future time stamps for America/Godthab, America/Santiago,
+    far-future timestamps for America/Godthab, America/Santiago,
     Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem,
     Pacific/Easter, and Pacific/Fiji.  Other zones are unaffected by
     this change.  (Derived from a suggestion by Arthur David Olson.)
@@ -1859,12 +1859,12 @@ Release 2013e - 2013-09-19 23:50:04 -0700
     embedded TZ-format string, and the tz file format version number
     has therefore been increased from 2 to 3 as a precaution.
     Version-2-based client code should continue to work as before for
-    all time stamps before 2038.  Existing version-2-based client code
+    all timestamps before 2038.  Existing version-2-based client code
     (tzcode, GNU/Linux, Solaris) has been tested on version-3-format
-    files, and typically works in practice even for time stamps after
+    files, and typically works in practice even for timestamps after
     2037; the only known exception is America/Godthab.
 
-  Changes affecting time stamps before 1970
+  Changes affecting timestamps before 1970
 
     Pacific/Johnston is now a link to Pacific/Honolulu.  This corrects
     some errors before 1947.
@@ -1872,7 +1872,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700
     Some zones have been turned into links, when they differ from existing
     zones only in older data entries that were likely invented or that
     differ only in LMT or transitions from LMT.  These changes affect
-    only time stamps before 1943.  The affected zones are:
+    only timestamps before 1943.  The affected zones are:
     Africa/Juba, America/Anguilla, America/Aruba, America/Dominica,
     America/Grenada, America/Guadeloupe, America/Marigot,
     America/Montserrat, America/St_Barthelemy, America/St_Kitts,
@@ -1882,11 +1882,11 @@ Release 2013e - 2013-09-19 23:50:04 -0700
     link is better for WWII-era times.)
 
     Change Kingston Mean Time from -5:07:12 to -5:07:11.  This affects
-    America/Cayman, America/Jamaica and America/Grand_Turk time stamps
+    America/Cayman, America/Jamaica and America/Grand_Turk timestamps
     from 1890 to 1912.
 
     Change the UT offset of Bern Mean Time from 0:29:44 to 0:29:46.
-    This affects Europe/Zurich time stamps from 1853 to 1894.  (Thanks
+    This affects Europe/Zurich timestamps from 1853 to 1894.  (Thanks
     to Alois Treindl).
 
     Change the date of the circa-1850 Zurich transition from 1849-09-12
@@ -1904,7 +1904,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700
     data can't be summarized using a TZ string, and uses a 402-year
     window rather than a 400-year window.  For the current data, this
     affects only the Asia/Tehran file.  It does not affect any of the
-    time stamps that this file represents, so zdump outputs the same
+    timestamps that this file represents, so zdump outputs the same
     information as before.  (Thanks to Andrew Main (Zefram).)
 
     The 'date' command has a new '-r' option, which lets you specify
@@ -1936,7 +1936,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700
   Changes affecting the zdump utility
 
     zdump now outputs "UT" when referring to Universal Time, not "UTC".
-    "UTC" does not make sense for time stamps that predate the introduction
+    "UTC" does not make sense for timestamps that predate the introduction
     of UTC, whereas "UT", a more-generic term, does.  (Thanks to Steve Allen
     for clarifying UT vs UTC.)
 
@@ -1947,7 +1947,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700
 
     Remove from zone.tab the names America/Montreal, America/Shiprock,
     and Antarctica/South_Pole, as they are equivalent to existing
-    same-country-code zones for post-1970 time stamps.  The data entries for
+    same-country-code zones for post-1970 timestamps.  The data entries for
     these names are unchanged, so the names continue to work as before.
 
   Changes affecting code internals
@@ -2007,7 +2007,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700
 
       There is a new section about the accuracy of the tz database,
       describing the many ways that errors can creep in, and
-      explaining why so many of the pre-1970 time stamps are wrong or
+      explaining why so many of the pre-1970 timestamps are wrong or
       misleading (thanks to Steve Allen, Lester Caine, and Garrett
       Wollman for discussions that contributed to this).
 
@@ -2042,7 +2042,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700
 
 Release 2013d - 2013-07-05 07:38:01 -0700
 
-  Changes affecting future time stamps:
+  Changes affecting future timestamps:
 
     Morocco's midsummer transitions this year are July 7 and August 10,
     not July 9 and August 8.  (Thanks to Andrew Paprocki.)
@@ -2050,7 +2050,7 @@ Release 2013d - 2013-07-05 07:38:01 -0700
     Israel now falls back on the last Sunday of October.
     (Thanks to Ephraim Silverberg.)
 
-  Changes affecting past time stamps:
+  Changes affecting past timestamps:
 
     Specify Jerusalem's location more precisely; this changes the pre-1880
     times by 2 s.
@@ -2088,7 +2088,7 @@ Release 2013d - 2013-07-05 07:38:01 -0700
 
 Release 2013c - 2013-04-19 16:17:40 -0700
 
-  Changes affecting current and future time stamps:
+  Changes affecting current and future timestamps:
 
     Palestine observed DST starting March 29, 2013.  (Thanks to
     Steffen Thorsen.)  From 2013 on, Gaza and Hebron both observe DST,
@@ -2099,7 +2099,7 @@ Release 2013c - 2013-04-19 16:17:40 -0700
     by moving the end of DST to the 4th Sunday in March every year.
     (Thanks to Carlos Raúl Perasso.)
 
-  Changes affecting past time stamps:
+  Changes affecting past timestamps:
 
     Fix some historical data for Palestine to agree with that of
     timeanddate.com, as follows:
@@ -2133,10 +2133,10 @@ Release 2013c - 2013-04-19 16:17:40 -0700
 
 Release 2013b - 2013-03-10 22:33:40 -0700
 
-  Changes affecting current and future time stamps:
+  Changes affecting current and future timestamps:
 
     Haiti uses US daylight-saving rules this year, and presumably future years.
-    This changes time stamps starting today.  (Thanks to Steffen Thorsen.)
+    This changes timestamps starting today.  (Thanks to Steffen Thorsen.)
 
     Paraguay will end DST on March 24 this year.
     (Thanks to Steffen Thorsen.)  For now, assume it's just this year.
@@ -2160,7 +2160,7 @@ Release 2013a - 2013-02-27 09:20:35 -0800
     The zone offset at the end of version-2-format zone files is now
     allowed to be 24:00, as per POSIX.1-2008.  (Thanks to Arthur David Olson.)
 
-  Changes affecting current and future time stamps:
+  Changes affecting current and future timestamps:
 
     Chile's 2013 rules, and we guess rules for 2014 and later, will be
     the same as 2012, namely Apr Sun>=23 03:00 UTC to Sep Sun>=2 04:00 UTC.
@@ -2169,7 +2169,7 @@ Release 2013a - 2013-02-27 09:20:35 -0800
     New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen.
     (Thanks to Tobias Conradi and Arthur David Olson.)
 
-  Many changes affect historical time stamps before 1940.
+  Many changes affect historical timestamps before 1940.
   These were deduced from: Milne J. Civil time. Geogr J. 1899
   Feb;13(2):173-94 <http://www.jstor.org/stable/1774359>.
 
@@ -2301,7 +2301,7 @@ Release 2012e - 2012-08-02 20:44:55 -0700
 
 Release code2012c-data2012d - 2012-07-19 16:35:33 -0700
 
-  Changes for Morocco's time stamps, which take effect in a couple of
+  Changes for Morocco's timestamps, which take effect in a couple of
   hours, along with infrastructure changes to accommodate how the tz
   code and data are released on IANA.
 
@@ -2445,12 +2445,12 @@ Release 2011e - 2011-03-31 16:04:38 -0400
 
 Release 2011d - 2011-03-14 09:18:01 -0400
 
-  changes that impact present-day time stamps in Cuba, Samoa, and Turkey
+  changes that impact present-day timestamps in Cuba, Samoa, and Turkey
 
 
 Release 2011c - 2011-03-07 09:30:09 -0500
 
-  These do affect current time stamps in Chile and Annette Island, Canada.
+  These do affect current timestamps in Chile and Annette Island, Canada.
 
 
 Release 2011b - 2011-02-07 08:44:50 -0500
@@ -3915,7 +3915,7 @@ few (e.g., code2012c-data2012d) have tarballs with mixed version
 numbers.  Recent releases also come in an experimental format
 consisting of a single tarball tzdb-R.tar.lz with extra data.
 
-Release time stamps are taken from the release's commit (for newer,
+Release timestamps are taken from the release's commit (for newer,
 Git-based 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 time zone of

newctime.3

@@ -77,12 +77,12 @@ misleading values for out-of-range years.
 .PP
 The
 .BI * clock
-time stamp represents the time in seconds since 1970-01-01 00:00:00
+timestamp represents the time in seconds since 1970-01-01 00:00:00
 Coordinated Universal Time (UTC).
-The POSIX standard says that time stamps must be nonnegative
+The POSIX standard says that timestamps must be nonnegative
 and must ignore leap seconds.
-Many implementations extend POSIX by allowing negative time stamps,
-and can therefore represent time stamps that predate the
+Many implementations extend POSIX by allowing negative timestamps,
+and can therefore represent timestamps that predate the
 introduction of UTC and are some other flavor of Universal Time (UT).
 Some implementations support leap seconds, in contradiction to POSIX.
 .PP

strftime.c

@@ -1,4 +1,4 @@
-/* Convert a broken-down time stamp to a string.  */
+/* Convert a broken-down timestamp to a string.  */
 
 /* Copyright 1989 The Regents of the University of California.
    All rights reserved.

tz-art.htm

@@ -157,7 +157,7 @@ savings days. Lousy farmers."
 "Tracks", <em>The Good Wife</em>, season 7, episode 12,
 CBS, 2016-01-17.
 The applicability of a contract hinges on the
-time zone associated with a video time stamp.
+time zone associated with a video timestamp.
 </li>
 </ul>
 <h2>Books, plays, and magazines</h2>

zdump.c

@@ -726,7 +726,7 @@ adjusted_yday(struct tm const *a, struct tm const *b)
    the same instant, return A's UTC offset in seconds, where positive
    offsets are east of Greenwich.  On failure, return LONG_MIN.
 
-   If T is nonnull, *T is the time stamp that corresponds to A; call
+   If T is nonnull, *T is the timestamp that corresponds to A; call
    my_gmtime_r and use its result instead of B.  Otherwise, B is the
    possibly nonnull result of an earlier call to my_gmtime_r.  */
 static long
@@ -807,11 +807,11 @@ format_local_time(char *buf, size_t size, struct tm const *tm)
 
 /* Store into BUF, of size SIZE, a formatted UTC offset for the
    localtime *TM corresponding to time T.  Use ISO 8601 format
-   +HHMMSS, or -HHMMSS for time stamps west of Greenwich; if the time
-   stamp represents an unknown UTC offset, use the format -00.  If the
-   hour needs more than two digits to represent, extend the length of
-   HH as needed.  Otherwise, omit SS if SS is zero, and omit MM too if
-   MM is also zero.
+   +HHMMSS, or -HHMMSS for timestamps west of Greenwich; use the
+   format -00 for unknown UTC offsets.  If the hour needs more than
+   two digits to represent, extend the length of HH as needed.
+   Otherwise, omit SS if SS is zero, and omit MM too if MM is also
+   zero.
 
    Return the length of the resulting string, or -1 if the result is
    not representable as a string.  If the string does not fit, return
@@ -874,7 +874,7 @@ format_quoted_string(char *buf, size_t size, char const *p)
   }
 }
 
-/* Store into BUF (of size SIZE) a time stamp formatted by TIME_FMT.
+/* Store into BUF (of size SIZE) a timestamp formatted by TIME_FMT.
    TM is the broken-down time, T the seconds count, AB the time zone
    abbreviation, and ZONE_NAME the zone name.  Return true if
    successful, false if the output would require more than SIZE bytes.