diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2023-03-07 20:00:01 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2023-03-07 20:00:17 -0800 |
commit | 12b48faf10c265ee3ea1aad8cdb5c8239eea65a0 (patch) | |
tree | 327e8f5e1f6fac2189cd2a36f3e1b744d5c79df2 | |
parent | adb0caa090526690ddd0e0efb242591dcf2d70c9 (diff) | |
download | tz-12b48faf10c265ee3ea1aad8cdb5c8239eea65a0.tar.gz |
Omit unnecessary hyphens
This was motivated by a desire to sync better with the Linux man
pages, which omitted an unnecessary hyphen in tzfile.5.
-rw-r--r-- | CONTRIBUTING | 2 | ||||
-rw-r--r-- | NEWS | 32 | ||||
-rw-r--r-- | africa | 2 | ||||
-rw-r--r-- | asctime.c | 2 | ||||
-rw-r--r-- | asia | 2 | ||||
-rw-r--r-- | backzone | 6 | ||||
-rw-r--r-- | localtime.c | 2 | ||||
-rw-r--r-- | northamerica | 2 | ||||
-rw-r--r-- | private.h | 2 | ||||
-rw-r--r-- | southamerica | 2 | ||||
-rw-r--r-- | theory.html | 10 | ||||
-rw-r--r-- | tz-how-to.html | 2 | ||||
-rw-r--r-- | tz-link.html | 8 | ||||
-rw-r--r-- | tzselect.ksh | 4 | ||||
-rw-r--r-- | zdump.c | 4 | ||||
-rw-r--r-- | zic.8 | 2 |
16 files changed, 42 insertions, 42 deletions
diff --git a/CONTRIBUTING b/CONTRIBUTING index 4c0f56a..6d800e4 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -18,7 +18,7 @@ To email small changes, please run a POSIX shell command like 'diff -u old/europe new/europe >myfix.patch', and attach 'myfix.patch' to the email. -For more-elaborate or possibly-controversial changes, +For more-elaborate or possibly controversial changes, such as renaming, adding or removing zones, please read "Theory and pragmatics of the tz code and data" <https://www.iana.org/time-zones/repository/theory.html>. @@ -667,7 +667,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 Starting with 2020a, zic -L truncated its output according to the "Expires" directive or "#expires" comment in the leapseconds file. The resulting TZif files omitted daylight saving transitions after - the leap second table expired, which led to far less-accurate + the leap second table expired, which led to far less accurate predictions of times after the expiry. Although future timestamps cannot be converted accurately in the presence of leap seconds, it is more accurate to convert near-future timestamps with a few @@ -687,7 +687,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 zic -L LEAPFILE -r @LO no longer generates an invalid TZif file that omits leap second information for the range LO..B when LO falls between two leap seconds A and B. Instead, it generates a - TZif version 4 file that represents the previously-missing + TZif version 4 file that represents the previously missing information. The TZif reader now allows the leap second table to begin with a @@ -741,7 +741,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 Fix a bug with 'zic -r @X' when X is a negative leap second that has a nonnegative correction. Without the fix, the output file was truncated so that X appeared to be a positive leap second. - Fix a similar, even-less-likely bug when truncating at a positive + Fix a similar, even less likely bug when truncating at a positive leap second that has a nonpositive correction. zic -r now reports an error if given rolling leap seconds, as this @@ -762,7 +762,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 fixing a bug introduced in 2014g. zdump -v now outputs timestamps at boundaries of what localtime - and gmtime can represent, instead of the less-useful timestamps + and gmtime can represent, instead of the less useful timestamps one day after the minimum and one day before the maximum. (Thanks to Arthur David Olson for prototype code, and to Manuela Friedrich for debugging help.) @@ -2382,7 +2382,7 @@ Release 2016g - 2016-09-13 08:56:38 -0700 names internally. zdump has a new -i option to generate transitions in a - more-compact but still human-readable format. This option is + smaller but still human-readable format. This option is experimental, and the output format may change in future versions. (Thanks to Jon Skeet for suggesting that an option was needed, and thanks to Tim Parenti and Chris Rovick for further comments.) @@ -2404,7 +2404,7 @@ Release 2016g - 2016-09-13 08:56:38 -0700 release 2016g, the version number is now something like '2016g-23-g50556e3-dirty' instead of the misleading '2016g'. Tagged releases use the same version number format as before, - e.g., '2016g'. To support the more-accurate version number, its + e.g., '2016g'. To support the more accurate version number, its specification has moved from a line in the Makefile to a new source file 'version'. @@ -3035,7 +3035,7 @@ Release 2014i - 2014-10-21 22:04:57 -0700 Since Belarus is not changing its clocks even though Moscow is, the time zone abbreviation in Europe/Minsk is changing from FET - to its more-traditional value MSK on 2014-10-26 at 01:00. + to its more traditional value MSK on 2014-10-26 at 01:00. (Thanks to Alexander Bokovoy for the heads-up about Belarus.) The new abbreviation IDT stands for the pre-1976 use of UT +08 in @@ -3127,7 +3127,7 @@ Release 2014h - 2014-09-25 18:59:03 -0700 Changes affecting build procedure - 'make check' now checks better for properly-sorted data. + 'make check' now checks better for properly sorted data. Changes affecting documentation and commentary @@ -3628,7 +3628,7 @@ Release 2014a - 2014-03-07 23:30:29 -0800 Changes affecting past timestamps - Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00. + Fiji ended DST on 2014-01-19 at 02:00, not the previously scheduled 03:00. (Thanks to Steffen Thorsen.) Ukraine switched from Moscow to Eastern European time on 1990-07-01 @@ -3882,7 +3882,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 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 + new Fiji rules. This is a more compact way to represent 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 @@ -3890,7 +3890,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 Allow POSIX-like TZ strings where daylight saving time is in effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western - Argentina Summer Time all year. This supports a more-compact way + Argentina Summer Time all year. This supports a more compact way to represent the 2013d data for America/Argentina/San_Luis. Because of the change for San Luis noted above this change does not affect the current data. (Thanks to Andrew Main (Zefram) for @@ -3979,13 +3979,13 @@ Release 2013e - 2013-09-19 23:50:04 -0700 zdump now outputs "UT" when referring to Universal Time, not "UTC". "UTC" does not make sense for timestamps that predate the introduction - of UTC, whereas "UT", a more-generic term, does. (Thanks to Steve Allen + of UTC, whereas "UT", a more generic term, does. (Thanks to Steve Allen for clarifying UT vs UTC.) Data changes affecting behavior of tzselect and similar programs - Country code BQ is now called the more-common name "Caribbean Netherlands" - rather than the more-official "Bonaire, St Eustatius & Saba". + Country code BQ is now called the more common name "Caribbean Netherlands" + rather than the more official "Bonaire, St Eustatius & Saba". Remove from zone.tab the names America/Montreal, America/Shiprock, and Antarctica/South_Pole, as they are equivalent to existing @@ -4169,7 +4169,7 @@ Release 2013c - 2013-04-19 16:17:40 -0700 Macquarie Island is politically part of Australia, not Antarctica. (Thanks to Tobias Conradi.) - Sort Macquarie more-consistently with other parts of Australia. + Sort Macquarie more consistently with other parts of Australia. (Thanks to Tim Parenti.) @@ -5393,7 +5393,7 @@ Release data1998g - 1998-08-11 03:28:35 -0000 Release data1998f - 1998-07-20 13:50:00 -0000 [tzdata1998f.tar.gz is missing!] - Update the "leapseconds" file to include the newly-announced + Update the "leapseconds" file to include the newly announced insertion at the end of 1998. @@ -438,7 +438,7 @@ Zone Africa/Nairobi 2:27:16 - LMT 1908 May # President William R. Tolbert, Jr., July 23, 1971-July 31, 1972. # Monrovia: Executive Mansion. # -# Use the abbreviation "MMT" before 1972, as the more-accurate numeric +# Use the abbreviation "MMT" before 1972, as the more accurate numeric # abbreviation "-004430" would be one byte over the POSIX limit. # # Zone NAME STDOFF RULES FORMAT [UNTIL] @@ -53,7 +53,7 @@ static char buf_asctime[2*3 + 5*INT_STRLEN_MAXIMUM(int) + 7 + 2 + 1 + 1]; /* A similar buffer for ctime. C89 requires that they be the same buffer. This requirement was removed in C99, so support it only if requested, - as support is more likely to lead to bugs in badly-written programs. */ + as support is more likely to lead to bugs in badly written programs. */ #if SUPPORT_C89 # define buf_ctime buf_asctime #else @@ -3632,7 +3632,7 @@ Zone Asia/Singapore 6:55:25 - LMT 1901 Jan 1 # standard time is SLST. # # From Paul Eggert (2016-10-18): -# "SLST" seems to be reasonably recent and rarely-used outside time +# "SLST" seems to be reasonably recent and rarely used outside time # zone nerd sources. I searched Google News and found three uses of # it in the International Business Times of India in February and # March of this year when discussing cricket match times, but nothing @@ -169,7 +169,7 @@ Zone Africa/Accra -0:00:52 - LMT 1915 Nov 2 # 12-hour clock starting at our 06:00, so their "8 o'clock" is our # 02:00 or 14:00. Keep this in mind when you ask the time in Amharic. # -# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time +# Shanks & Pottenger write that Ethiopia had six narrowly spaced time # zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in # 1890, and that they switched to 3:00 on 1936-05-05. Perhaps 38E50 # was for Adis Dera. Quite likely the Shanks data entries are wrong @@ -499,7 +499,7 @@ Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad # ever since standard time was introduced, but the information from # McKinnon sounds more authoritative. For now, assume that Atikokan # switched to EST immediately after WWII era daylight saving time -# ended. This matches the old (less-populous) America/Coral_Harbour +# ended. This matches the old (less populous) America/Coral_Harbour # entry since our cutoff date of 1970, so we can move # America/Coral_Harbour to the 'backward' file. @@ -1761,7 +1761,7 @@ Link Pacific/Chuuk Pacific/Yap # Enderbury was inhabited 1860/1880s to mine guano, and 1938-03-06/1942-02-09 # for aviation (ostensibly commercial, but military uses foreseen). # The 19th-century dates are approximate. See Pacific/Kanton for -# the currently-inhabited representative for this timezone. +# the currently inhabited representative for this timezone. Zone Pacific/Enderbury 0 - -00 1860 -11:24:20 - LMT 1885 0 - -00 1938 Mar 6 diff --git a/localtime.c b/localtime.c index 9b5d0a5..3135ea3 100644 --- a/localtime.c +++ b/localtime.c @@ -188,7 +188,7 @@ static int lcl_is_set; ** Thanks to Paul Eggert for noting this. ** ** This requirement was removed in C99, so support it only if requested, -** as support is more likely to lead to bugs in badly-written programs. +** as support is more likely to lead to bugs in badly written programs. */ #if SUPPORT_C89 diff --git a/northamerica b/northamerica index 13ff594..765f5bb 100644 --- a/northamerica +++ b/northamerica @@ -596,7 +596,7 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 20:00u # local times of other Alaskan locations so that they change simultaneously. # From Paul Eggert (2014-07-18): -# One opinion of the early-1980s turmoil in Alaska over time zones and +# One opinion of the early 1980s turmoil in Alaska over time zones and # daylight saving time appeared as graffiti on a Juneau airport wall: # "Welcome to Juneau. Please turn your watch back to the 19th century." # See: Turner W. Alaska's four time zones now two. NY Times 1983-11-01. @@ -275,7 +275,7 @@ /* ** Define HAVE_STDINT_H's default value here, rather than at the ** start, since __GLIBC__ and INTMAX_MAX's values depend on -** previously-included files. glibc 2.1 and Solaris 10 and later have +** previously included files. glibc 2.1 and Solaris 10 and later have ** stdint.h, even with pre-C99 compilers. */ #if !defined HAVE_STDINT_H && defined __has_include diff --git a/southamerica b/southamerica index 87b71d5..e55c5f0 100644 --- a/southamerica +++ b/southamerica @@ -208,7 +208,7 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 - # Hora de verano para la República Argentina # http://buenasiembra.com.ar/esoterismo/astrologia/hora-de-verano-de-la-republica-argentina-27.html # 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 +# to 1920-05-01 was -4:16:48.25. Go with this more precise value # over Shanks & Pottenger. It is upward compatible with Milne, who # says Córdoba time was -4:16:48.2. diff --git a/theory.html b/theory.html index 7870a91..c4b29e3 100644 --- a/theory.html +++ b/theory.html @@ -791,7 +791,7 @@ href="https://www.dissentmagazine.org/blog/booked-a-global-history-of-time-vanes with days starting at midnight. Although <abbr>UT</abbr> equals <abbr>UTC</abbr> for modern timestamps, <abbr>UTC</abbr> was not defined until 1960, so - commentary uses the more-general abbreviation <abbr>UT</abbr> for + commentary uses the more general abbreviation <abbr>UT</abbr> for timestamps that might predate 1960. Since <abbr>UT</abbr>, <abbr>UT1</abbr>, etc. disagree slightly, and since pre-1972 <abbr>UTC</abbr> seconds varied in length, @@ -1242,7 +1242,7 @@ The <code><abbr>tz</abbr></code> code and data supply the following interfaces: Interface changes in a release attempt to preserve compatibility with recent releases. For example, <code><abbr>tz</abbr></code> data files typically do not -rely on recently-added <code>zic</code> features, so that users can +rely on recently added <code>zic</code> features, so that users can run older <code>zic</code> versions to process newer data files. <a href="tz-link.html#download">Downloading the <code><abbr>tz</abbr></code> database</a> describes how releases @@ -1272,7 +1272,7 @@ between now and the future time. <h2 id="leapsec">Leap seconds</h2> <p> Leap seconds were introduced in 1972 to accommodate the -difference between atomic time and the less-regular rotation of the earth. +difference between atomic time and the less regular rotation of the earth. Unfortunately they caused so many problems with civil timekeeping that they are <a href="https://www.bipm.org/en/cgpm-2022/resolution-4">planned @@ -1296,12 +1296,12 @@ commonly used by <a href="https://www.ntp.org"><abbr title="Network Time Protocol">NTP</abbr></a> software that adjusts the kernel clock. However, kernel-clock twiddling approximates UTC only roughly, -and systems needing more-precise UTC can use this package's leap +and systems needing more precise UTC can use this package's leap second support directly. </p> <p> -The directly-supported mechanism assumes that <code>time_t</code> +The directly supported mechanism assumes that <code>time_t</code> counts of seconds since the POSIX epoch normally include leap seconds, as opposed to POSIX <code>time_t</code> counts which exclude leap seconds. This modified timescale is converted to <abbr>UTC</abbr> diff --git a/tz-how-to.html b/tz-how-to.html index 05013b4..9e438f9 100644 --- a/tz-how-to.html +++ b/tz-how-to.html @@ -567,7 +567,7 @@ the abbreviations. They are intended to be the values returned through the function in the <a href="https://kirste.userpage.fu-berlin.de/chemnet/use/info/libc/libc_19.html#SEC324">“C” locale</a>. -<li>If there is no generally-accepted abbreviation for a time zone, +<li>If there is no generally accepted abbreviation for a time zone, a numeric offset is used instead, e.g., <code>+07</code> for 7 hours ahead of Greenwich. By convention, <code>-00</code> is used in a zone while uninhabited, where the offset is zero but in some sense diff --git a/tz-link.html b/tz-link.html index 2db3b8d..27d4ccb 100644 --- a/tz-link.html +++ b/tz-link.html @@ -169,14 +169,14 @@ through <samp>zzz</samp>, and so on). Since version 2022a, each release has been distributed in <a href="https://pubs.opengroup.org/onlinepubs/9699919799/utilities/pax.html#tag_20_92_13_06">POSIX ustar interchange format</a>, compressed as described above; -older releases use a nearly-compatible format. +older releases use a nearly compatible format. Since version 2016h, each release has contained a text file named "<samp>version</samp>" whose first (and currently only) line is the version. Older releases are <a href="https://ftp.iana.org/tz/releases/">archived</a>, and are also available in an <a href="ftp://ftp.iana.org/tz/releases/"><abbr title="File Transfer Protocol">FTP</abbr> directory</a> via a -less-secure protocol.</p> +less secure protocol.</p> <p>Alternatively, a development repository of code and data can be retrieved from <a href="https://github.com">GitHub</a> via the shell command:</p> @@ -982,7 +982,7 @@ href="http://leapsecond.com/hpan/an1289.pdf">The Science of Timekeeping</a> is a thorough introduction to the theory and practice of precision timekeeping.</li> <li><a href="https://doi.org/10.1007/978-3-319-59909-0">The Science of -Time 2016</a> contains several freely-readable papers.</li> +Time 2016</a> contains several freely readable papers.</li> <li><a href="https://www.ntp.org"><abbr title="Network Time Protocol">NTP</abbr>: The Network Time Protocol</a> (Internet <abbr>RFC</abbr> 5905) @@ -1054,7 +1054,7 @@ and to In practice the two configurations also agree for timestamps before 1972 even though the historical situation is messy, partly because neither <abbr>UTC</abbr> nor <abbr>TAI</abbr> -is well-defined for sufficiently-old timestamps.</li> +is well-defined for sufficiently old timestamps.</li> <li><a href="https://developers.google.com/time/smear">Leap Smear</a> discusses how to gradually adjust <abbr>POSIX</abbr> clocks near a leap second so that they disagree with <abbr>UTC</abbr> by at most a diff --git a/tzselect.ksh b/tzselect.ksh index b8f6407..9a91acf 100644 --- a/tzselect.ksh +++ b/tzselect.ksh @@ -82,8 +82,8 @@ Report bugs to $REPORT_BUGS_TO." # Ask the user to select from the function's arguments, # and assign the selected argument to the variable 'select_result'. -# Exit on EOF or I/O error. Use the shell's 'select' builtin if available, -# falling back on a less-nice but portable substitute otherwise. +# Exit on EOF or I/O error. Use the shell's nicer 'select' builtin if +# available, falling back on a portable substitute otherwise. if case $BASH_VERSION in ?*) : ;; @@ -326,7 +326,7 @@ gmtzinit(void) "Link GMT GMT0" line in the "backward" file, and which should work on all POSIX platforms. The rest of zdump does not use the "GMT" abbreviation that comes from this setting, so it - is OK to use "GMT" here rather than the more-modern "UTC" which + is OK to use "GMT" here rather than the modern "UTC" which would not work on platforms that omit the "backward" file. */ gmtz = tzalloc("GMT"); if (!gmtz) { @@ -415,7 +415,7 @@ abbrok(const char *const abbrp, const char *const zone) /* Return a time zone abbreviation. If the abbreviation needs to be saved, use *BUF (of size *BUFALLOC) to save it, and return the - abbreviation in the possibly-reallocated *BUF. Otherwise, just + abbreviation in the possibly reallocated *BUF. Otherwise, just return the abbreviation. Get the abbreviation from TMP. Exit on memory allocation failure. */ static char const * @@ -148,7 +148,7 @@ to timestamps in the range from .I lo and .I hi -are possibly-signed decimal counts of seconds since the Epoch +are possibly signed decimal counts of seconds since the Epoch (1970-01-01 00:00:00 UTC). Omitted counts default to extreme values. The output files use UT offset 0 and abbreviation |