Module Name: src
Committed By: kre
Date: Thu Dec 7 20:13:37 UTC 2023
Modified Files:
src/lib/libc/time: zic.8
Log Message:
Fix a wording botch noticed by uwe@ (and one more smaller one), and
a few more markup issues. While here, consistemntly use minus when
minus is meant, rather that just using a hyphen.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/lib/libc/time/zic.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/zic.8
diff -u src/lib/libc/time/zic.8:1.46 src/lib/libc/time/zic.8:1.47
--- src/lib/libc/time/zic.8:1.46 Thu Dec 7 16:16:03 2023
+++ src/lib/libc/time/zic.8 Thu Dec 7 20:13:37 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: zic.8,v 1.46 2023/12/07 16:16:03 uwe Exp $
+.\" $NetBSD: zic.8,v 1.47 2023/12/07 20:13:37 kre Exp $
.\" @(#)zic.8 8.6
.\" This file is in the public domain, so clarified as of
.\" 2009-05-17 by Arthur David Olson.
@@ -11,8 +11,8 @@
.Nd timezone compiler
.Sh SYNOPSIS
.Nm
-.Op Fl \-version
-.Op Fl \-help
+.Op Fl Fl version
+.Op Fl Fl help
.Op Fl b
.Op Fl d Ar directory
.Op Fl L Ar leapsecondfilename
@@ -32,7 +32,7 @@ specified in this input.
If a
.Ar file
is
-.Ql \&- ,
+.Ql \&\- ,
standard input is read.
.Ss Options
.Bl -tag -width Fl
@@ -79,7 +79,7 @@ will act as if the input contained a lin
If
.Ar timezone
is
-.Ql - ,
+.Ql \&\- ,
any already-existing link is removed.
.It Fl L Ar leapsecondfilename
Read leap second information from the file with the given name.
@@ -89,7 +89,7 @@ no leap second information appears in ou
Use
.Ar timezone Ap s
rules when handling POSIX-format TZ strings like
-.Ql EET-2EEST
+.Ql EET\-2EEST
that lack transition rules.
.Nm
will act as if the input contained a link line of the form
@@ -99,7 +99,7 @@ will act as if the input contained a lin
Unless
.Ar timezone
is
-.Ql - ,
+.Ql \&\- ,
this option is obsolete and poorly supported.
Among other things it should not be used for timestamps after the year 2037,
and it should not be combined with
@@ -110,7 +110,7 @@ transitions are at standard time or Univ
If
.Ar timezone
is
-.Ql - ,
+.Ql \&\- ,
any already-existing link is removed.
.It Fl r Op Cm @ Ns Ar lo Ns Op Cm /@ Ns Ar hi
Limit the applicability of output files
@@ -126,7 +126,7 @@ are possibly signed decimal counts of se
(1970-01-01 00:00:00 UTC).
Omitted counts default to extreme values.
The output files use UT offset 0 and abbreviation
-.Qq "\*-00"
+.Qq \&\-00
in place of the omitted timestamp data.
For example,
.Pp
@@ -256,13 +256,13 @@ POSIX requires at least 3, and requires
at least 6.
.It
An output file name contains a byte that is not an ASCII letter,
-.Ql - ,
+.Ql \&\- ,
.Ql / ,
or
.Ql _ ;
or it contains a file name component that contains more than 14 bytes
or that starts with
-.Ql - .
+.Ql \&\- .
.El
.El
.\"
@@ -328,13 +328,13 @@ A
has the form
.Pp
.Bl -column -compact -offset indent "Rule" "NAME" "FROM" "1995" "\&*" "Apr" "lastSun" "2:00w" "1:00d" "LETTER/S"
-.It Rule NAME FROM TO \&- IN ON AT SAVE LETTER/S
+.It Rule NAME FROM TO \&\- IN ON AT SAVE LETTER/S
.El
.Pp
For example:
.Pp
.Bl -column -compact -offset indent "Rule" "NAME" "FROM" "1995" "\&*" "Apr" "lastSun" "2:00w" "1:00d" "LETTER/S"
-.It Rule US 1967 1973 \&- Apr lastSun 2:00w 1:00d D
+.It Rule US 1967 1973 \&\- Apr lastSun 2:00w 1:00d D
.El
.Pp
The fields that make up a rule line are:
@@ -345,7 +345,7 @@ Gives the name of the rule set that cont
The name must start with a character that is neither an
.Tn ASCII
digit nor
-.Ql -
+.Ql \&\-
nor
.Ql + .
To allow for future extensions,
@@ -380,16 +380,16 @@ may be used to repeat the value of the
.Ar FROM
field.
.\"
-.It Cm \&-
-should be
-.Ql \&-
+.It Cm \&\-
+should always be
+.Ql \&\-
for compatibility with older versions of
.Nm .
It was previously known as the
.Ar TYPE
field, which could contain values to allow a
separate script to further restrict in which
-.Em types
+.Qq types
of years the rule would apply.
.\"
.It Ar IN
@@ -458,9 +458,9 @@ midday, 12 hours after 00:00
end of day, 24 hours after 00:00
.It Li 260:00
260 hours after 00:00
-.It Li -2:30
+.It Li \-2:30
2.5 hours before 00:00
-.It Li -
+.It Li \-
equivalent to 0
.El
.Pp
@@ -500,8 +500,7 @@ Gives the amount of time to be added to
effect, and whether the resulting time is standard or daylight saving.
This field has the same format as the
.Ar AT
-field
-.\" XXX: edito?
+field, except with a different set of suffix letters:
.Ql s
for standard time and
.Ql d
@@ -534,7 +533,7 @@ or
.Ql EDT )
of time zone abbreviations to be used when this rule is in effect.
If this field is
-.Ql - ,
+.Ql \&\- ,
the variable part is null.
.El
.\"
@@ -585,7 +584,7 @@ alternatively, a field in the same forma
column, giving the amount of time to be added to local standard time
and whether the resulting time is standard or daylight saving.
If this field is
-.Ql \&-
+.Ql \&\-
then standard time always applies.
When an amount of time is given, only the sum of standard time and
this amount matters.
@@ -611,7 +610,7 @@ and
are the hours, minutes, and seconds east
.Pq \&+
or west
-.Pq \-
+.Pq \&\-
of UT.
Alternatively,
a slash
@@ -623,9 +622,9 @@ alphanumeric
characters,
.Ql +
and
-.Ql \&- .
+.Ql \&\- .
By convention, the time zone abbreviation
-.Ql \&-00
+.Ql \&\-00
is a placeholder that means local time is unspecified.
.\"
.It Ar UNTIL
@@ -690,24 +689,24 @@ that would otherwise take effect in the
seconds is instead assumed to take effect simultaneously.
For example:
.Pp
-.Bl -column -compact -offset indent "# Rule" "NAME" "FROM" "2006" "\&-" "Oct" "lastSun" "1:00" "SAVE" "LETTER/S"
-.It # Rule NAME FROM TO \&- IN ON AT SAVE LETTER/S
-.It Rule US 1967 2006 \&- Oct lastSun 2:00 0 S
-.It Rule US 1967 1973 \&- Apr lastSun 2:00 1:00 D
+.Bl -column -compact -offset indent "# Rule" "NAME" "FROM" "2006" "\&\-" "Oct" "lastSun" "1:00" "SAVE" "LETTER/S"
+.It # Rule NAME FROM TO \&\- IN ON AT SAVE LETTER/S
+.It Rule US 1967 2006 \&\- Oct lastSun 2:00 0 S
+.It Rule US 1967 1973 \&\- Apr lastSun 2:00 1:00 D
.El
.Bl -column -compact -offset indent "# Zone" "America/Menominee" "STDOFF" "RULES" "FORMAT" "[UNTIL]"
.It # Zone NAME STDOFF RULES FORMAT [UNTIL]
-.It Zone America/Menominee \&-5:00 \&- EST 1973 Apr 29 2:00
-.It \& \& \&-6:00 US C%sT
+.It Zone America/Menominee \&\-5:00 \&\- EST 1973 Apr 29 2:00
+.It \& \& \&\-6:00 US C%sT
.El
.Pp
Here, an incorrect reading would be there were two clock changes on 1973-04-29,
-the first from 02:00 EST (\&-05) to 01:00 CST (\&-06),
-and the second an hour later from 02:00 CST (\&-06) to 03:00 CDT (\&-05).
+the first from 02:00 EST (\&\-05) to 01:00 CST (\&\-06),
+and the second an hour later from 02:00 CST (\&\-06) to 03:00 CDT (\&\-05).
However,
.Nm
-interprets this more sensibly as a single transition from 02:00 CST (\&-05) to
-02:00 CDT (\&-05).
+interprets this more sensibly as a single transition from 02:00 CST (\&\-05) to
+02:00 CDT (\&\-05).
.\"
.\" Link Line
.\"
@@ -746,7 +745,7 @@ For example:
.Bl -column -offset indent "Link" "Greenwich" "Greenwich"
.It Link Greenwich G_M_T
.It Link Etc/GMT Greenwich
-.It Zone Etc/GMT 0 - GMT
+.It Zone Etc/GMT 0 \- GMT
.El
.Pp
The two links are chained together, and G_M_T, Greenwich, and Etc/GMT
@@ -789,7 +788,7 @@ field
should be
.Ql \&+
if a second was added or
-.Ql \&-
+.Ql \&\-
if a second was skipped.
The
.Ar R/S
@@ -846,22 +845,22 @@ Here is an extended example of
input, intended to illustrate many of its features.
.Pp
.Bl -column -compact -offset indent "# Rule" "Swiss" "FROM" "1995" "\&*" "Oct" "lastSun" "1:00u" "SAVE" "LETTER/S"
-.It # Rule NAME FROM TO \&- IN ON AT SAVE LETTER/S
-.It Rule Swiss 1941 1942 \&- May Mon>=1 1:00 1:00 S
-.It Rule Swiss 1941 1942 \&- Oct Mon>=1 2:00 0 -
-.Pp
-.It Rule EU 1977 1980 \&- Apr Sun>=1 1:00u 1:00 S
-.It Rule EU 1977 only \&- Sep lastSun 1:00u 0 -
-.It Rule EU 1978 only \&- Oct 1 1:00u 0 -
-.It Rule EU 1979 1995 \&- Sep lastSun 1:00u 0 -
-.It Rule EU 1981 max \&- Mar lastSun 1:00u 1:00 S
-.It Rule EU 1996 max \&- Oct lastSun 1:00u 0 -
+.It # Rule NAME FROM TO \&\- IN ON AT SAVE LETTER/S
+.It Rule Swiss 1941 1942 \&\- May Mon>=1 1:00 1:00 S
+.It Rule Swiss 1941 1942 \&\- Oct Mon>=1 2:00 0 \-
+.Pp
+.It Rule EU 1977 1980 \&\- Apr Sun>=1 1:00u 1:00 S
+.It Rule EU 1977 only \&\- Sep lastSun 1:00u 0 \-
+.It Rule EU 1978 only \&\- Oct 1 1:00u 0 \-
+.It Rule EU 1979 1995 \&\- Sep lastSun 1:00u 0 \-
+.It Rule EU 1981 max \&\- Mar lastSun 1:00u 1:00 S
+.It Rule EU 1996 max \&\- Oct lastSun 1:00u 0 \-
.El
.Pp
.Bl -column -compact -offset indent "# Zone" "Europe/Zurich" "0:29:45.50" "RULES/SAVE" "FORMAT" "UNTIL"
.It # Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL]
-.It Zone Europe/Zurich 0:34:08 \&- LMT 1853 Jul 16
-.It 0:29:45.50 \&- BMT 1894 Jun
+.It Zone Europe/Zurich 0:34:08 \&\- LMT 1853 Jul 16
+.It 0:29:45.50 \&\- BMT 1894 Jun
.It 1:00 Swiss CE%sT 1981
.It 1:00 EU CE%sT
.Pp
