[OVERVIEW 0/9] Cleanup Time

[OVERVIEW 0/9] Cleanup Time

[Michael Witten]

This patch series is a medley of cleanups
focused mainly on issues related to time.

Subjects:

    [PATCH 1/9] tzset.3: Cleanup grammar/clarity
    [PATCH 2/9] stime.2, strftime.3, tzset.3, zic.8: GMT -> UTC (where appropriate)
    [PATCH 3/9] strftime.3: Clarification of %z
    [PATCH 4/9] strftime.3: %z is defined by the SUSv3
    [PATCH 5/9] strftime.3: Move 822-compliant date format example to EXAMPLES section
    [PATCH 6/9] strftime.3: Expanded introduction
    [PATCH 7/9] "timezone" -> "time zone"
    [PATCH 8/9] Consistently define the Epoch
    [PATCH 9/9] "null terminated" -> "null-terminated"

Overall diffstat

    man2/gettimeofday.2  |    4 +-
    man2/stime.2         |    4 +-
    man2/time.2          |    4 +-
    man2/utimensat.2     |    6 ++--
    man3/ctime.3         |   13 +++++------
    man3/difftime.3      |    6 ++--
    man3/ftime.3         |    6 ++--
    man3/fts.3           |    8 +++---
    man3/getdate.3       |    2 +-
    man3/getnetent.3     |    2 +-
    man3/getprotoent.3   |    2 +-
    man3/getrpcent.3     |    2 +-
    man3/getservent.3    |    2 +-
    man3/getspnam.3      |    4 +-
    man3/getsubopt.3     |    2 +-
    man3/mq_receive.3    |    2 +-
    man3/mq_send.3       |    2 +-
    man3/putgrent.3      |    2 +-
    man3/rtime.3         |    4 +-
    man3/sem_wait.3      |    2 +-
    man3/strcat.3        |    4 +-
    man3/strcpy.3        |    2 +-
    man3/strftime.3      |   58 +++++++++++++++++++++++++++++++++----------------
    man3/strptime.3      |    7 ++---
    man3/sysconf.3       |    2 +-
    man3/timeradd.3      |    3 +-
    man3/tzset.3         |   44 +++++++++++++++++++-------------------
    man4/console_ioctl.4 |    2 +-
    man4/rtc.4           |    2 +-
    man5/core.5          |    2 +-
    man5/proc.5          |    2 +-
    man5/tzfile.5        |   18 +++++++-------
    man7/environ.7       |    2 +-
    man7/hier.7          |    2 +-
    man7/icmp.7          |    2 +-
    man7/time.7          |    2 +-
    man8/tzselect.8      |   10 ++++----
    man8/zdump.8         |    2 +-
    man8/zic.8           |   30 +++++++++++++-------------
    39 files changed, 146 insertions(+), 129 deletions(-)

Sincerely,
Michael Witten
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/9] tzset.3: Cleanup grammar/clarity

[Michael Witten]

* A comma is added at the end of an introductory phrase.

* The preposition `to' is used to complete the idea of
  setting a variable's value.

* The conjunction `or' is introduced to separate alternative
  values for `daylight'.

Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 man3/tzset.3 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man3/tzset.3 b/man3/tzset.3
index 10c6d3a..ad496f7 100644
--- a/man3/tzset.3
+++ b/man3/tzset.3
@@ -66,9 +66,9 @@ function initializes the \fItzname\fP variable from the
 environment variable.
 This function is automatically called by the
 other time conversion functions that depend on the timezone.
-In a System-V-like environment it will also set the variables \fItimezone\fP
-(seconds West of GMT) and \fIdaylight\fP (0 if this timezone does not
-have any daylight saving time rules, non-zero if there is a time during
+In a System-V-like environment, it will also set the variables \fItimezone\fP
+(to seconds West of GMT) and \fIdaylight\fP (to 0 if this timezone does not
+have any daylight saving time rules, or to non-zero if there is a time during
 the year when daylight saving time applies).
 .PP
 If the
-- 
1.6.6.102.gd6f8f

--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/9] tzset.3: Cleanup grammar/clarity

[Michael Kerrisk]

Hi Michael

On Sun, Jan 10, 2010 at 12:45 PM, Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> * A comma is added at the end of an introductory phrase.
>
> * The preposition `to' is used to complete the idea of
>  setting a variable's value.
>
> * The conjunction `or' is introduced to separate alternative
>  values for `daylight'.


Thanks. Applied for 3.24!

Cheers,

Michael


> Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  man3/tzset.3 |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/man3/tzset.3 b/man3/tzset.3
> index 10c6d3a..ad496f7 100644
> --- a/man3/tzset.3
> +++ b/man3/tzset.3
> @@ -66,9 +66,9 @@ function initializes the \fItzname\fP variable from the
>  environment variable.
>  This function is automatically called by the
>  other time conversion functions that depend on the timezone.
> -In a System-V-like environment it will also set the variables \fItimezone\fP
> -(seconds West of GMT) and \fIdaylight\fP (0 if this timezone does not
> -have any daylight saving time rules, non-zero if there is a time during
> +In a System-V-like environment, it will also set the variables \fItimezone\fP
> +(to seconds West of GMT) and \fIdaylight\fP (to 0 if this timezone does not
> +have any daylight saving time rules, or to non-zero if there is a time during
>  the year when daylight saving time applies).
>  .PP
>  If the
> --
> 1.6.6.102.gd6f8f
>
>



-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Author of "The Linux Programming Interface" http://blog.man7.org/
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/9] stime.2, strftime.3, tzset.3, zic.8: GMT -> UTC (where appropriate)

[Michael Witten]

Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 man2/stime.2    |    2 +-
 man3/strftime.3 |    2 +-
 man3/tzset.3    |    4 ++--
 man8/zic.8      |    8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/man2/stime.2 b/man2/stime.2
index 07fef5e..530d223 100644
--- a/man2/stime.2
+++ b/man2/stime.2
@@ -46,7 +46,7 @@ _SVID_SOURCE
 .BR stime ()
 sets the system's idea of the time and date.
 Time, pointed
-to by \fIt\fP, is measured in seconds from 00:00:00 GMT January 1, 1970.
+to by \fIt\fP, is measured in seconds from 00:00:00 UTC January 1, 1970.
 .BR stime ()
 may only be executed by the superuser.
 .SH "RETURN VALUE"
diff --git a/man3/strftime.3 b/man3/strftime.3
index 8dfe58c..e356ccb 100644
--- a/man3/strftime.3
+++ b/man3/strftime.3
@@ -242,7 +242,7 @@ The year as a decimal number without a century (range 00 to 99).
 The year as a decimal number including the century.
 .TP
 .B %z
-The time-zone as hour offset from GMT.
+The time-zone as hour offset from UTC.
 Required to emit RFC\ 822-conformant dates
 (using "%a,\ %d\ %b\ %Y\ %H:%M:%S\ %z"). (GNU)
 .TP
diff --git a/man3/tzset.3 b/man3/tzset.3
index ad496f7..1d74405 100644
--- a/man3/tzset.3
+++ b/man3/tzset.3
@@ -67,7 +67,7 @@ environment variable.
 This function is automatically called by the
 other time conversion functions that depend on the timezone.
 In a System-V-like environment, it will also set the variables \fItimezone\fP
-(to seconds West of GMT) and \fIdaylight\fP (to 0 if this timezone does not
+(to seconds West of UTC) and \fIdaylight\fP (to 0 if this timezone does not
 have any daylight saving time rules, or to non-zero if there is a time during
 the year when daylight saving time applies).
 .PP
@@ -223,7 +223,7 @@ It has been obsolete for many years but is required by SUSv2.
 .BI "char *timezone(" zone ", " dst )
 that returned the
 name of the timezone corresponding to its first argument (minutes
-West of GMT).
+West of UTC).
 If the second argument was 0, the standard name was used,
 otherwise the daylight saving time version.
 .SH "SEE ALSO"
diff --git a/man8/zic.8 b/man8/zic.8
index 949fb62..8cb63bb 100644
--- a/man8/zic.8
+++ b/man8/zic.8
@@ -260,8 +260,8 @@ A zone line has the form
 .sp
 .nf
 .ti +.5i
-.ta \w'Zone\0\0'u +\w'Australia/Adelaide\0\0'u +\w'GMTOFF\0\0'u +\w'RULES/SAVE\0\0'u +\w'FORMAT\0\0'u
-Zone	NAME	GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
+.ta \w'Zone\0\0'u +\w'Australia/Adelaide\0\0'u +\w'UTC_OFFSET\0\0'u +\w'RULES/SAVE\0\0'u +\w'FORMAT\0\0'u
+Zone	NAME	UTC_OFFSET	RULES/SAVE	FORMAT	[UNTIL]
 .sp
 For example:
 .sp
@@ -270,13 +270,13 @@ Zone	Australia/Adelaide	9:30	Aus	CST	1971 Oct 31 2:00
 .sp
 .fi
 The fields that make up a zone line are:
-.TP "\w'GMTOFF'u"
+.TP "\w'UTC_OFFSET'u"
 .B NAME
 The name of the timezone.
 This is the name used in creating the time conversion information file for the
 zone.
 .TP
-.B GMTOFF
+.B UTC_OFFSET
 The amount of time to add to UTC to get standard time in this zone.
 This field has the same format as the
 .B AT
-- 
1.6.6.102.gd6f8f

--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/9] stime.2, strftime.3, tzset.3, zic.8: GMT -> UTC (where appropriate)

[Michael Kerrisk]

Hi Michael

On Sun, Jan 10, 2010 at 12:45 PM, Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  man2/stime.2    |    2 +-
>  man3/strftime.3 |    2 +-
>  man3/tzset.3    |    4 ++--
>  man8/zic.8      |    8 ++++----
>  4 files changed, 8 insertions(+), 8 deletions(-)

Tanks. I've applied most of this. For the zic.8, I made it UTCOFF
rather than UTF_OFFSET, just to maintain the same width of text.

Cheers,

Michael


> diff --git a/man2/stime.2 b/man2/stime.2
> index 07fef5e..530d223 100644
> --- a/man2/stime.2
> +++ b/man2/stime.2
> @@ -46,7 +46,7 @@ _SVID_SOURCE
>  .BR stime ()
>  sets the system's idea of the time and date.
>  Time, pointed
> -to by \fIt\fP, is measured in seconds from 00:00:00 GMT January 1, 1970.
> +to by \fIt\fP, is measured in seconds from 00:00:00 UTC January 1, 1970.
>  .BR stime ()
>  may only be executed by the superuser.
>  .SH "RETURN VALUE"
> diff --git a/man3/strftime.3 b/man3/strftime.3
> index 8dfe58c..e356ccb 100644
> --- a/man3/strftime.3
> +++ b/man3/strftime.3
> @@ -242,7 +242,7 @@ The year as a decimal number without a century (range 00 to 99).
>  The year as a decimal number including the century.
>  .TP
>  .B %z
> -The time-zone as hour offset from GMT.
> +The time-zone as hour offset from UTC.
>  Required to emit RFC\ 822-conformant dates
>  (using "%a,\ %d\ %b\ %Y\ %H:%M:%S\ %z"). (GNU)
>  .TP
> diff --git a/man3/tzset.3 b/man3/tzset.3
> index ad496f7..1d74405 100644
> --- a/man3/tzset.3
> +++ b/man3/tzset.3
> @@ -67,7 +67,7 @@ environment variable.
>  This function is automatically called by the
>  other time conversion functions that depend on the timezone.
>  In a System-V-like environment, it will also set the variables \fItimezone\fP
> -(to seconds West of GMT) and \fIdaylight\fP (to 0 if this timezone does not
> +(to seconds West of UTC) and \fIdaylight\fP (to 0 if this timezone does not
>  have any daylight saving time rules, or to non-zero if there is a time during
>  the year when daylight saving time applies).
>  .PP
> @@ -223,7 +223,7 @@ It has been obsolete for many years but is required by SUSv2.
>  .BI "char *timezone(" zone ", " dst )
>  that returned the
>  name of the timezone corresponding to its first argument (minutes
> -West of GMT).
> +West of UTC).
>  If the second argument was 0, the standard name was used,
>  otherwise the daylight saving time version.
>  .SH "SEE ALSO"
> diff --git a/man8/zic.8 b/man8/zic.8
> index 949fb62..8cb63bb 100644
> --- a/man8/zic.8
> +++ b/man8/zic.8
> @@ -260,8 +260,8 @@ A zone line has the form
>  .sp
>  .nf
>  .ti +.5i
> -.ta \w'Zone\0\0'u +\w'Australia/Adelaide\0\0'u +\w'GMTOFF\0\0'u +\w'RULES/SAVE\0\0'u +\w'FORMAT\0\0'u
> -Zone   NAME    GMTOFF  RULES/SAVE      FORMAT  [UNTIL]
> +.ta \w'Zone\0\0'u +\w'Australia/Adelaide\0\0'u +\w'UTC_OFFSET\0\0'u +\w'RULES/SAVE\0\0'u +\w'FORMAT\0\0'u
> +Zone   NAME    UTC_OFFSET      RULES/SAVE      FORMAT  [UNTIL]
>  .sp
>  For example:
>  .sp
> @@ -270,13 +270,13 @@ Zone      Australia/Adelaide      9:30    Aus     CST     1971 Oct 31 2:00
>  .sp
>  .fi
>  The fields that make up a zone line are:
> -.TP "\w'GMTOFF'u"
> +.TP "\w'UTC_OFFSET'u"
>  .B NAME
>  The name of the timezone.
>  This is the name used in creating the time conversion information file for the
>  zone.
>  .TP
> -.B GMTOFF
> +.B UTC_OFFSET
>  The amount of time to add to UTC to get standard time in this zone.
>  This field has the same format as the
>  .B AT
> --
> 1.6.6.102.gd6f8f
>
>



-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Author of "The Linux Programming Interface" http://blog.man7.org/
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 3/9] strftime.3: Clarification of %z

[Michael Witten]

Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 man3/strftime.3 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man3/strftime.3 b/man3/strftime.3
index e356ccb..9b1b0b0 100644
--- a/man3/strftime.3
+++ b/man3/strftime.3
@@ -242,7 +242,7 @@ The year as a decimal number without a century (range 00 to 99).
 The year as a decimal number including the century.
 .TP
 .B %z
-The time-zone as hour offset from UTC.
+The +hhmm or -hhmm numeric time zone (that is, the hour and minute offset from UTC).
 Required to emit RFC\ 822-conformant dates
 (using "%a,\ %d\ %b\ %Y\ %H:%M:%S\ %z"). (GNU)
 .TP
-- 
1.6.6.102.gd6f8f

--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3/9] strftime.3: Clarification of %z

[Michael Kerrisk]

Hi Michael,

On Sun, Jan 10, 2010 at 12:45 PM, Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  man3/strftime.3 |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)


Thanks. Applied for 3.24.

Cheers,

Michael


> diff --git a/man3/strftime.3 b/man3/strftime.3
> index e356ccb..9b1b0b0 100644
> --- a/man3/strftime.3
> +++ b/man3/strftime.3
> @@ -242,7 +242,7 @@ The year as a decimal number without a century (range 00 to 99).
>  The year as a decimal number including the century.
>  .TP
>  .B %z
> -The time-zone as hour offset from UTC.
> +The +hhmm or -hhmm numeric time zone (that is, the hour and minute offset from UTC).
>  Required to emit RFC\ 822-conformant dates
>  (using "%a,\ %d\ %b\ %Y\ %H:%M:%S\ %z"). (GNU)
>  .TP
> --
> 1.6.6.102.gd6f8f
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-man" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>



-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Author of "The Linux Programming Interface" http://blog.man7.org/
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 4/9] strftime.3: %z is defined by the SUSv3

[Michael Witten]

On my system, `man 3p strftime' defines %z (much more rigorously).
You can see for yourself here:

  http://www.opengroup.org/onlinepubs/009695399/functions/strftime.html

So, it would appear that %z is no longer just a GNU extension.
Hence, the `(GNU)' tag has been replaced with the `(SU)' tag.

Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 man3/strftime.3 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man3/strftime.3 b/man3/strftime.3
index 9b1b0b0..0d925fa 100644
--- a/man3/strftime.3
+++ b/man3/strftime.3
@@ -244,7 +244,7 @@ The year as a decimal number including the century.
 .B %z
 The +hhmm or -hhmm numeric time zone (that is, the hour and minute offset from UTC).
 Required to emit RFC\ 822-conformant dates
-(using "%a,\ %d\ %b\ %Y\ %H:%M:%S\ %z"). (GNU)
+(using "%a,\ %d\ %b\ %Y\ %H:%M:%S\ %z"). (SU)
 .TP
 .B %Z
 The timezone or name or abbreviation.
-- 
1.6.6.102.gd6f8f

--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 5/9] strftime.3: Move 822-compliant date format example to EXAMPLES section

[Michael Witten]

The RFC 822-compliant date format given in the description of `%z'
is now moved to the `EXAMPLES' section (note: `EXAMPLE' has been
renamed `EXAMPLES').

Furthermore, that format example is now actually RFC 822-compliant
(using `%y' instead of `%Y') and has been qualified as being correct
only when in the context of at least an English locale. Also, `%T'
is used in place of `%H:%M:%S'.

For completeness, an RFC 2822-compliant format example has been
similarly added.

The formatting of the EXAMPLES section has been improved.

Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 man3/strftime.3 |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/man3/strftime.3 b/man3/strftime.3
index 0d925fa..bafe841 100644
--- a/man3/strftime.3
+++ b/man3/strftime.3
@@ -242,9 +242,7 @@ The year as a decimal number without a century (range 00 to 99).
 The year as a decimal number including the century.
 .TP
 .B %z
-The +hhmm or -hhmm numeric time zone (that is, the hour and minute offset from UTC).
-Required to emit RFC\ 822-conformant dates
-(using "%a,\ %d\ %b\ %Y\ %H:%M:%S\ %z"). (SU)
+The +hhmm or -hhmm numeric time zone (that is, the hour and minute offset from UTC). (SU)
 .TP
 .B %Z
 The timezone or name or abbreviation.
@@ -441,14 +439,30 @@ Nowadays,
 .BR gcc (1)
 provides the \fI\-Wno\-format\-y2k\fP option to prevent the warning,
 so that the above workaround is no longer required.
-.SH EXAMPLE
+.SH EXAMPLES
+.BR "RFC\ 2822-compliant date format"
+(with an English locale for %a and %b)
+.PP
+.in +2n
+"%a,\ %d\ %b\ %Y\ %T\ %z"
+.PP
+.BR "RFC\ 822-compliant date format"
+(with an English locale for %a and %b)
+.PP
+.in +2n
+"%a,\ %d\ %b\ %y\ %T\ %z"
+.PP
+.BR "Sample program"
+.PP
+.in +2n
 The program below can be used to experiment with
 .BR strftime ().
 .PP
+.in +2n
 Some examples of the result string produced by the glibc implementation of
 .BR strftime ()
 are as follows:
-.in +4n
+.in +2n
 .nf
 
 .RB "$" " ./a.out \(aq%m\(aq"
@@ -457,9 +471,11 @@ Result string is "11"
 Result string is "00011"
 .RB "$" " ./a.out \(aq%_5m\(aq"
 Result string is "   11"
+
 .fi
-.in
-.SS Program source
+.in -2n
+Here is the program source:
+.in +2n
 \&
 .nf
 #include <time.h>
-- 
1.6.6.102.gd6f8f

--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 5/9] strftime.3: Move 822-compliant date format example to EXAMPLES section

[Michael Kerrisk]

Hi Michael,

On Sun, Jan 10, 2010 at 12:45 PM, Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> The RFC 822-compliant date format given in the description of `%z'
> is now moved to the `EXAMPLES' section (note: `EXAMPLE' has been
> renamed `EXAMPLES').
>
> Furthermore, that format example is now actually RFC 822-compliant
> (using `%y' instead of `%Y') and has been qualified as being correct
> only when in the context of at least an English locale. Also, `%T'
> is used in place of `%H:%M:%S'.
>
> For completeness, an RFC 2822-compliant format example has been
> similarly added.
>
> The formatting of the EXAMPLES section has been improved.

I've applied a slightly modified version of this patch (I reformatted
the pieces to do with the example program differently from what you
suggested).

Thanks!

Michael


> Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  man3/strftime.3 |   30 +++++++++++++++++++++++-------
>  1 files changed, 23 insertions(+), 7 deletions(-)
>
> diff --git a/man3/strftime.3 b/man3/strftime.3
> index 0d925fa..bafe841 100644
> --- a/man3/strftime.3
> +++ b/man3/strftime.3
> @@ -242,9 +242,7 @@ The year as a decimal number without a century (range 00 to 99).
>  The year as a decimal number including the century.
>  .TP
>  .B %z
> -The +hhmm or -hhmm numeric time zone (that is, the hour and minute offset from UTC).
> -Required to emit RFC\ 822-conformant dates
> -(using "%a,\ %d\ %b\ %Y\ %H:%M:%S\ %z"). (SU)
> +The +hhmm or -hhmm numeric time zone (that is, the hour and minute offset from UTC). (SU)
>  .TP
>  .B %Z
>  The timezone or name or abbreviation.
> @@ -441,14 +439,30 @@ Nowadays,
>  .BR gcc (1)
>  provides the \fI\-Wno\-format\-y2k\fP option to prevent the warning,
>  so that the above workaround is no longer required.
> -.SH EXAMPLE
> +.SH EXAMPLES
> +.BR "RFC\ 2822-compliant date format"
> +(with an English locale for %a and %b)
> +.PP
> +.in +2n
> +"%a,\ %d\ %b\ %Y\ %T\ %z"
> +.PP
> +.BR "RFC\ 822-compliant date format"
> +(with an English locale for %a and %b)
> +.PP
> +.in +2n
> +"%a,\ %d\ %b\ %y\ %T\ %z"
> +.PP
> +.BR "Sample program"
> +.PP
> +.in +2n
>  The program below can be used to experiment with
>  .BR strftime ().
>  .PP
> +.in +2n
>  Some examples of the result string produced by the glibc implementation of
>  .BR strftime ()
>  are as follows:
> -.in +4n
> +.in +2n
>  .nf
>
>  .RB "$" " ./a.out \(aq%m\(aq"
> @@ -457,9 +471,11 @@ Result string is "11"
>  Result string is "00011"
>  .RB "$" " ./a.out \(aq%_5m\(aq"
>  Result string is "   11"
> +
>  .fi
> -.in
> -.SS Program source
> +.in -2n
> +Here is the program source:
> +.in +2n
>  \&
>  .nf
>  #include <time.h>
> --
> 1.6.6.102.gd6f8f
>
>



-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Author of "The Linux Programming Interface" http://blog.man7.org/
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 6/9] strftime.3: Expanded introduction

[Michael Witten]

Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 man3/strftime.3 |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/man3/strftime.3 b/man3/strftime.3
index bafe841..38f3afb 100644
--- a/man3/strftime.3
+++ b/man3/strftime.3
@@ -51,13 +51,18 @@ result in the character array \fIs\fP of size \fImax\fP.
 .\" FIXME POSIX says: Local timezone information is used as though
 .\" strftime() called tzset().  But this doesn't appear to be the case
 .PP
-Ordinary characters placed in the format string are copied to \fIs\fP
-without conversion.
-.I "Conversion specifications"
-are introduced by a \(aq%\(aq
-character, and terminated by a
-.IR "conversion specifier character" ,
-and are replaced in \fIs\fP as follows:
+The format specification is a null-terminated string and may contain
+special character sequences called
+.IR "conversion specifications",
+each of which is introduced by a \(aq%\(aq character and terminated by
+some other character known as a
+.IR "conversion specifier character".
+All other character sequences are
+.IR "ordinary character sequences".
+.PP
+The characters of ordinary character sequences (including the null byte)
+are copied verbatim from \fIformat\fP to \fIs\fP. However, the characters
+of conversion specifications are replaced as follows:
 .TP
 .B %a
 The abbreviated weekday name according to the current locale.
-- 
1.6.6.102.gd6f8f

--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 6/9] strftime.3: Expanded introduction

[Michael Kerrisk]

Hi Michael,

On Sun, Jan 10, 2010 at 12:45 PM, Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  man3/strftime.3 |   19 ++++++++++++-------
>  1 files changed, 12 insertions(+), 7 deletions(-)

Thanks!  Applied for 3.24.

Cheers,

Michael


> diff --git a/man3/strftime.3 b/man3/strftime.3
> index bafe841..38f3afb 100644
> --- a/man3/strftime.3
> +++ b/man3/strftime.3
> @@ -51,13 +51,18 @@ result in the character array \fIs\fP of size \fImax\fP.
>  .\" FIXME POSIX says: Local timezone information is used as though
>  .\" strftime() called tzset().  But this doesn't appear to be the case
>  .PP
> -Ordinary characters placed in the format string are copied to \fIs\fP
> -without conversion.
> -.I "Conversion specifications"
> -are introduced by a \(aq%\(aq
> -character, and terminated by a
> -.IR "conversion specifier character" ,
> -and are replaced in \fIs\fP as follows:
> +The format specification is a null-terminated string and may contain
> +special character sequences called
> +.IR "conversion specifications",
> +each of which is introduced by a \(aq%\(aq character and terminated by
> +some other character known as a
> +.IR "conversion specifier character".
> +All other character sequences are
> +.IR "ordinary character sequences".
> +.PP
> +The characters of ordinary character sequences (including the null byte)
> +are copied verbatim from \fIformat\fP to \fIs\fP. However, the characters
> +of conversion specifications are replaced as follows:
>  .TP
>  .B %a
>  The abbreviated weekday name according to the current locale.
> --
> 1.6.6.102.gd6f8f
>
>



-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Author of "The Linux Programming Interface" http://blog.man7.org/
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 7/9] "timezone" -> "time zone"

[Michael Witten]

Well, I was flabbergasted to discover that `timezone' is not
a word; two words are required: `time zone'.

Indeed, even The Free On-line Dictionary of Computing provides
a definition for just `time zone'.

Hence, all relevant occurrences of `timezone' have been replaced
by `time zone'.

Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 man2/gettimeofday.2 |    4 ++--
 man3/ctime.3        |   10 +++++-----
 man3/ftime.3        |    2 +-
 man3/getdate.3      |    2 +-
 man3/strftime.3     |    6 +++---
 man3/strptime.3     |    4 ++--
 man3/sysconf.3      |    2 +-
 man3/tzset.3        |   38 +++++++++++++++++++-------------------
 man5/tzfile.5       |   18 +++++++++---------
 man7/environ.7      |    2 +-
 man7/hier.7         |    2 +-
 man8/tzselect.8     |   10 +++++-----
 man8/zdump.8        |    2 +-
 man8/zic.8          |   22 +++++++++++-----------
 14 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/man2/gettimeofday.2 b/man2/gettimeofday.2
index d036876..2384b0c 100644
--- a/man2/gettimeofday.2
+++ b/man2/gettimeofday.2
@@ -62,7 +62,7 @@ The functions
 .BR gettimeofday ()
 and
 .BR settimeofday ()
-can get and set the time as well as a timezone.
+can get and set the time as well as a time zone.
 The
 .I tv
 argument is a
@@ -160,7 +160,7 @@ Daylight Saving Time is in force cannot be given
 by a simple algorithm, one per country; indeed,
 this period is determined by unpredictable political
 decisions.
-So this method of representing timezones
+So this method of representing time zones
 has been abandoned.
 Under Linux, in a call to
 .BR settimeofday ()
diff --git a/man3/ctime.3 b/man3/ctime.3
index f31f3d9..75e2f76 100644
--- a/man3/ctime.3
+++ b/man3/ctime.3
@@ -164,7 +164,7 @@ functions.
 The function also sets the external
 variables \fItzname\fP, \fItimezone\fP, and \fIdaylight\fP (see
 .BR tzset (3))
-with information about the current timezone.
+with information about the current time zone.
 The reentrant version
 .BR ctime_r ()
 does the same, but stores the
@@ -190,11 +190,11 @@ The
 .BR localtime ()
 function converts the calendar time \fItimep\fP to
 broken-time representation, expressed relative to the user's specified
-timezone.
+time zone.
 The function acts as if it called
 .BR tzset (3)
 and sets the external variables \fItzname\fP with
-information about the current timezone, \fItimezone\fP with the difference
+information about the current time zone, \fItimezone\fP with the difference
 between Coordinated Universal Time (UTC) and local standard time in
 seconds, and \fIdaylight\fP to a non-zero value if daylight savings
 time rules apply during some part of the year.
@@ -240,7 +240,7 @@ a positive value means DST is in effect;
 zero means that DST is not in effect;
 and a negative value means that
 .BR mktime ()
-should (use timezone information and system databases to)
+should (use time zone information and system databases to)
 attempt to determine whether DST is in effect at the specified time.
 
 The
@@ -261,7 +261,7 @@ to indicate whether DST is or is not in effect at the specified time.
 Calling
 .BR mktime ()
 also sets the external variable \fItzname\fP with
-information about the current timezone.
+information about the current time zone.
 
 If the specified broken-down
 time cannot be represented as calendar time (seconds since the Epoch),
diff --git a/man3/ftime.3 b/man3/ftime.3
index 4df11bd..ce01574 100644
--- a/man3/ftime.3
+++ b/man3/ftime.3
@@ -56,7 +56,7 @@ struct timeb {
 Here \fItime\fP is the number of seconds since the Epoch,
 and \fImillitm\fP is the number of milliseconds since \fItime\fP
 seconds since the Epoch.
-The \fItimezone\fP field is the local timezone measured in minutes
+The \fItimezone\fP field is the local time zone measured in minutes
 of time west of Greenwich (with a negative value indicating minutes
 east of Greenwich).
 The \fIdstflag\fP field
diff --git a/man3/getdate.3 b/man3/getdate.3
index d87e1f0..28773aa 100644
--- a/man3/getdate.3
+++ b/man3/getdate.3
@@ -87,7 +87,7 @@ When
 .B %Z
 is given, the structure containing the broken-down time
 is initialized with values corresponding to the current
-time in the given timezone.
+time in the given time zone.
 Otherwise, the structure is initialized to the broken-down time
 corresponding to the current local time (as by a call to
 .BR localtime (3)).
diff --git a/man3/strftime.3 b/man3/strftime.3
index 38f3afb..ee7b097 100644
--- a/man3/strftime.3
+++ b/man3/strftime.3
@@ -48,7 +48,7 @@ The
 function formats the broken-down time \fItm\fP
 according to the format specification \fIformat\fP and places the
 result in the character array \fIs\fP of size \fImax\fP.
-.\" FIXME POSIX says: Local timezone information is used as though
+.\" FIXME POSIX says: Local time zone information is used as though
 .\" strftime() called tzset().  But this doesn't appear to be the case
 .PP
 The format specification is a null-terminated string and may contain
@@ -250,7 +250,7 @@ The year as a decimal number including the century.
 The +hhmm or -hhmm numeric time zone (that is, the hour and minute offset from UTC). (SU)
 .TP
 .B %Z
-The timezone or name or abbreviation.
+The time zone or name or abbreviation.
 .TP
 .B %+
 .\" Nov 05 -- Not in Linux/glibc, but is in some BSDs (according to
@@ -327,7 +327,7 @@ are used.
 SVr4, C89, C99.
 There are strict inclusions between the set of conversions
 given in ANSI C (unmarked), those given in the Single Unix Specification
-(marked SU), those given in Olson's timezone package (marked TZ),
+(marked SU), those given in Olson's zoneinfo package (marked TZ),
 and those given in glibc (marked GNU), except that
 .B %+
 is not supported in glibc2.
diff --git a/man3/strptime.3 b/man3/strptime.3
index 99897f1..aaba1d1 100644
--- a/man3/strptime.3
+++ b/man3/strptime.3
@@ -352,10 +352,10 @@ Otherwise, it is the last week
 of the previous year, and the next week is week 1.
 .TP
 .B %z
-An RFC-822/ISO 8601 standard timezone specification.
+An RFC-822/ISO 8601 standard time zone specification.
 .TP
 .B %Z
-The timezone name.
+The time zone name.
 .LP
 Similarly, because of GNU extensions to
 .BR strftime (3),
diff --git a/man3/sysconf.3 b/man3/sysconf.3
index 690f904..0486bb0 100644
--- a/man3/sysconf.3
+++ b/man3/sysconf.3
@@ -206,7 +206,7 @@ Must not be less than
 (9).
 .TP
 .BR TZNAME_MAX " - " _SC_TZNAME_MAX
-The maximum number of bytes in a timezone name.
+The maximum number of bytes in a time zone name.
 Must not be less than
 .B _POSIX_TZNAME_MAX
 (6).
diff --git a/man3/tzset.3 b/man3/tzset.3
index 1d74405..e8590b1 100644
--- a/man3/tzset.3
+++ b/man3/tzset.3
@@ -65,9 +65,9 @@ function initializes the \fItzname\fP variable from the
 .B TZ
 environment variable.
 This function is automatically called by the
-other time conversion functions that depend on the timezone.
+other time conversion functions that depend on the time zone.
 In a System-V-like environment, it will also set the variables \fItimezone\fP
-(to seconds West of UTC) and \fIdaylight\fP (to 0 if this timezone does not
+(to seconds West of UTC) and \fIdaylight\fP (to 0 if this time zone does not
 have any daylight saving time rules, or to non-zero if there is a time during
 the year when daylight saving time applies).
 .PP
@@ -78,10 +78,10 @@ variable is initialized with the best approximation of local wall clock
 time, as specified by the
 .BR tzfile (5)-format
 file \fIlocaltime\fP
-found in the system timezone directory (see below).
+found in the system time zone directory (see below).
 (One also often sees
 .I /etc/localtime
-used here, a symlink to the right file in the system timezone directory.)
+used here, a symlink to the right file in the system time zone directory.)
 .PP
 If the
 .B TZ
@@ -93,19 +93,19 @@ The value of
 .B TZ
 can be one of three formats.
 The first format is used
-when there is no daylight saving time in the local timezone:
+when there is no daylight saving time in the local time zone:
 .sp
 .RS
 .I std offset
 .RE
 .sp
-The \fIstd\fP string specifies the name of the timezone and must be
+The \fIstd\fP string specifies the name of the time zone and must be
 three or more alphabetic characters.
 The \fIoffset\fP string immediately
 follows \fIstd\fP and specifies the time value to be added to the local
 time to get Coordinated Universal Time (UTC).
 The \fIoffset\fP is positive
-if the local timezone is west of the Prime Meridian and negative if it is
+if the local time zone is west of the Prime Meridian and negative if it is
 east.
 The hour must be between 0 and 24, and the minutes and seconds
 0 and 59.
@@ -118,9 +118,9 @@ The second format is used when there is daylight saving time:
 .sp
 There are no spaces in the specification.
 The initial \fIstd\fP and
-\fIoffset\fP specify the standard timezone, as described above.
+\fIoffset\fP specify the standard time zone, as described above.
 The \fIdst\fP string and \fIoffset\fP specify the name and offset for the
-corresponding daylight saving timezone.
+corresponding daylight saving time zone.
 If the offset is omitted,
 it default to one hour ahead of standard time.
 .PP
@@ -159,26 +159,26 @@ and the changeovers happen at the default time of 02:00:00:
     TZ="NZST-12.00:00NZDT-13:00:00,M10.1.0,M3.3.0"
 .fi
 .PP
-The third format specifies that the timezone information should be read
+The third format specifies that the time zone information should be read
 from a file:
 .sp
 .RS
 :[filespec]
 .RE
 .sp
-If the file specification \fIfilespec\fP is omitted, the timezone
+If the file specification \fIfilespec\fP is omitted, the time zone
 information is read from the file
 .I localtime
-in the system timezone directory, which nowadays usually is
+in the system time zone directory, which nowadays usually is
 .IR /usr/share/zoneinfo .
 This file is in
 .BR tzfile (5)
 format.
 If \fIfilespec\fP is given, it specifies another
 .BR tzfile (5)-format
-file to read the timezone information from.
+file to read the time zone information from.
 If \fIfilespec\fP does not begin with a \(aq/\(aq, the file specification is
-relative to the system timezone directory.
+relative to the system time zone directory.
 .PP
 Here's an example, once more for New Zealand:
 .nf
@@ -186,7 +186,7 @@ Here's an example, once more for New Zealand:
     TZ=":Pacific/Auckland"
 .fi
 .SH FILES
-The system timezone directory used depends on the (g)libc version.
+The system time zone directory used depends on the (g)libc version.
 Libc4 and libc5 use
 .IR /usr/lib/zoneinfo ,
 and, since libc-5.4.6,
@@ -198,9 +198,9 @@ when that exists.
 Its default depends on how it was installed, but normally is
 .IR /usr/share/zoneinfo .
 .LP
-This timezone directory contains the files
+This time zone directory contains the files
 .nf
-localtime      local timezone file
+localtime      local time zone file
 posixrules     rules for POSIX-style TZ's
 .fi
 .LP
@@ -208,7 +208,7 @@ Often
 .I /etc/localtime
 is a symlink to the file
 .I localtime
-or to the correct timezone file in the system timezone directory.
+or to the correct time zone file in the system time zone directory.
 .SH "CONFORMING TO"
 SVr4, POSIX.1-2001, 4.3BSD.
 .SH NOTES
@@ -222,7 +222,7 @@ It has been obsolete for many years but is required by SUSv2.
 4.3BSD had a function
 .BI "char *timezone(" zone ", " dst )
 that returned the
-name of the timezone corresponding to its first argument (minutes
+name of the time zone corresponding to its first argument (minutes
 West of UTC).
 If the second argument was 0, the standard name was used,
 otherwise the daylight saving time version.
diff --git a/man5/tzfile.5 b/man5/tzfile.5
index 1e41c7e..6ec7561 100644
--- a/man5/tzfile.5
+++ b/man5/tzfile.5
@@ -3,14 +3,14 @@
 .\" 1996-06-05 by Arthur David Olson <arthur_david_olson-2zaOuxCdfhg@public.gmane.org>.
 .TH TZFILE 5 1996-06-05 "" "Linux Programmer's Manual"
 .SH NAME
-tzfile \- timezone information
+tzfile \- time zone information
 .SH SYNOPSIS
 .B #include <tzfile.h>
 .SH DESCRIPTION
-The timezone information files used by
+The time zone information files used by
 .BR tzset (3)
 begin with the magic characters "TZif" to identify then as
-timezone information files,
+time zone information files,
 followed by sixteen bytes reserved for future use,
 followed by six four-byte values of type
 .IR long ,
@@ -37,7 +37,7 @@ The number of "local time types" for which data is stored
 in the file (must not be zero).
 .TP
 .I tzh_charcnt
-The number of characters of "timezone abbreviation strings"
+The number of characters of "time zone abbreviation strings"
 stored in the file.
 .PP
 The above header is followed by
@@ -88,7 +88,7 @@ should be set by
 .BR localtime (3),
 and
 .I tt_abbrind
-serves as an index into the array of timezone abbreviation characters
+serves as an index into the array of time zone abbreviation characters
 that follow the
 .I ttinfo
 structure(s) in the file.
@@ -110,16 +110,16 @@ Then there are
 standard/wall indicators, each stored as a one-byte value;
 they tell whether the transition times associated with local time types
 were specified as standard time or wall clock time,
-and are used when a timezone file is used in handling POSIX-style
-timezone environment variables.
+and are used when a time zone file is used in handling POSIX-style
+time zone environment variables.
 .PP
 Finally, there are
 .I tzh_ttisgmtcnt
 UTC/local indicators, each stored as a one-byte value;
 they tell whether the transition times associated with local time types
 were specified as UTC or local time,
-and are used when a timezone file is used in handling POSIX-style
-timezone environment variables.
+and are used when a time zone file is used in handling POSIX-style
+time zone environment variables.
 .PP
 .I Localtime
 uses the first standard-time
diff --git a/man7/environ.7 b/man7/environ.7
index 2ffb12a..9929279 100644
--- a/man7/environ.7
+++ b/man7/environ.7
@@ -163,7 +163,7 @@ to be used with
 .BR gethostbyname (3).
 .LP
 .BR TZ " and " TZDIR
-give timezone information used by
+give time zone information used by
 .BR tzset (3)
 and through that by functions like
 .BR ctime (3),
diff --git a/man7/hier.7 b/man7/hier.7
index 8acfbfe..e5e0b2e 100644
--- a/man7/hier.7
+++ b/man7/hier.7
@@ -358,7 +358,7 @@ The database for terminfo.
 Troff macros that are not distributed with groff.
 .TP
 .I /usr/share/zoneinfo
-Files for timezone information.
+Files for time zone information.
 .TP
 .I /usr/src
 Source files for different parts of the system, included with some packages
diff --git a/man8/tzselect.8 b/man8/tzselect.8
index 717eaee..c843781 100644
--- a/man8/tzselect.8
+++ b/man8/tzselect.8
@@ -2,21 +2,21 @@
 .\"
 .TH TZSELECT 8 2007-05-18 "" "Linux System Administration"
 .SH NAME
-tzselect \- select a timezone
+tzselect \- select a time zone
 .SH SYNOPSIS
 .B tzselect
 .SH DESCRIPTION
 The
 .B tzselect
 program asks the user for information about the current location,
-and outputs the resulting timezone description to standard output.
+and outputs the resulting time zone description to standard output.
 The output is suitable as a value for the
 .B TZ
 environment variable.
 .PP
 All interaction with the user is done via standard input and standard error.
 .SH "EXIT STATUS"
-The exit status is zero if a timezone was successfully obtained
+The exit status is zero if a time zone was successfully obtained
 from the user, non-zero otherwise.
 .SH ENVIRONMENT
 .TP
@@ -27,7 +27,7 @@ program (default:
 .BR awk ).
 .TP
 \fBTZDIR\fP
-Name of the directory containing timezone data files (default:
+Name of the directory containing time zone data files (default:
 .IR /usr/share/zoneinfo ).
 .\" or perhaps /usr/local/etc/zoneinfo in some older systems.
 .SH FILES
@@ -40,7 +40,7 @@ Table of country codes, latitude and longitude, TZ values, and
 descriptive comments.
 .TP
 \fBTZDIR\fP\fI/\fP\fITZ\fP
-Time zone data file for timezone \fITZ\fP.
+Time zone data file for time zone \fITZ\fP.
 .SH "SEE ALSO"
 .BR tzfile (5),
 .BR zdump (8),
diff --git a/man8/zdump.8 b/man8/zdump.8
index d9e9d7e..f216569 100644
--- a/man8/zdump.8
+++ b/man8/zdump.8
@@ -2,7 +2,7 @@
 .\"
 .TH ZDUMP 8 2007-05-18 "" "Linux System Administration"
 .SH NAME
-zdump \- timezone dumper
+zdump \- time zone dumper
 .SH SYNOPSIS
 .B zdump
 [
diff --git a/man8/zic.8 b/man8/zic.8
index 8cb63bb..1d09884 100644
--- a/man8/zic.8
+++ b/man8/zic.8
@@ -2,7 +2,7 @@
 .\"
 .TH ZIC 8 2007-05-18 "" "Linux System Administration"
 .SH NAME
-zic \- timezone compiler
+zic \- time zone compiler
 .SH SYNOPSIS
 .B zic
 [
@@ -51,7 +51,7 @@ Create time conversion information files in the named directory rather than
 in the standard directory named below.
 .TP
 .BI "\-l " timezone
-Use the given timezone as local time.
+Use the given time zone as local time.
 .I Zic
 will act as if the input contained a link line of the form
 .sp
@@ -59,8 +59,8 @@ will act as if the input contained a link line of the form
 Link	\fItimezone\fP		localtime
 .TP
 .BI "\-p " timezone
-Use the given timezone's rules when handling POSIX-format
-timezone environment variables.
+Use the given time zone's rules when handling POSIX-format
+time zone environment variables.
 .I Zic
 will act as if the input contained a link line of the form
 .sp
@@ -251,7 +251,7 @@ in
 .q EST
 or
 .q EDT )
-of timezone abbreviations to be used when this rule is in effect.
+of time zone abbreviations to be used when this rule is in effect.
 If this field is
 .BR \- ,
 the variable part is null.
@@ -272,7 +272,7 @@ Zone	Australia/Adelaide	9:30	Aus	CST	1971 Oct 31 2:00
 The fields that make up a zone line are:
 .TP "\w'UTC_OFFSET'u"
 .B NAME
-The name of the timezone.
+The name of the time zone.
 This is the name used in creating the time conversion information file for the
 zone.
 .TP
@@ -286,19 +286,19 @@ fields of rule lines;
 begin the field with a minus sign if time must be subtracted from UTC.
 .TP
 .B RULES/SAVE
-The name of the rule(s) that apply in the timezone or,
+The name of the rule(s) that apply in the time zone or,
 alternately, an amount of time to add to local standard time.
 If this field is
 .B \-
-then standard time always applies in the timezone.
+then standard time always applies in the time zone.
 .TP
 .B FORMAT
-The format for timezone abbreviations in this timezone.
+The format for time zone abbreviations in this time zone.
 The pair of characters
 .B %s
 is used to show where the
 .q "variable part"
-of the timezone abbreviation goes.
+of the time zone abbreviation goes.
 Alternately,
 a slash (/)
 separates standard and daylight abbreviations.
@@ -307,7 +307,7 @@ separates standard and daylight abbreviations.
 The time at which the UTC offset or the rule(s) change for a location.
 It is specified as a year, a month, a day, and a time of day.
 If this is specified,
-the timezone information is generated from the given UTC offset
+the time zone information is generated from the given UTC offset
 and rule change until the time specified.
 The month, day, and time of day have the same format as the IN, ON, and AT
 columns of a rule; trailing columns can be omitted, and default to the
-- 
1.6.6.102.gd6f8f

--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 7/9] "timezone" -> "time zone"

[Michael Kerrisk]

Hi Michael

On Sun, Jan 10, 2010 at 12:45 PM, Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> Well, I was flabbergasted to discover that `timezone' is not
> a word; two words are required: `time zone'.
>
> Indeed, even The Free On-line Dictionary of Computing provides
> a definition for just `time zone'.
>
> Hence, all relevant occurrences of `timezone' have been replaced
> by `time zone'.

Whether one includes or elides space in terms like this tends to vary
across sources, but generally there is a tendency over tiume to elide
in English. I'm rejecting this patch. Like you, I am inclined to
accept "timezone" as a word.

Cheers,

Michael


>
> Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  man2/gettimeofday.2 |    4 ++--
>  man3/ctime.3        |   10 +++++-----
>  man3/ftime.3        |    2 +-
>  man3/getdate.3      |    2 +-
>  man3/strftime.3     |    6 +++---
>  man3/strptime.3     |    4 ++--
>  man3/sysconf.3      |    2 +-
>  man3/tzset.3        |   38 +++++++++++++++++++-------------------
>  man5/tzfile.5       |   18 +++++++++---------
>  man7/environ.7      |    2 +-
>  man7/hier.7         |    2 +-
>  man8/tzselect.8     |   10 +++++-----
>  man8/zdump.8        |    2 +-
>  man8/zic.8          |   22 +++++++++++-----------
>  14 files changed, 62 insertions(+), 62 deletions(-)
>
> diff --git a/man2/gettimeofday.2 b/man2/gettimeofday.2
> index d036876..2384b0c 100644
> --- a/man2/gettimeofday.2
> +++ b/man2/gettimeofday.2
> @@ -62,7 +62,7 @@ The functions
>  .BR gettimeofday ()
>  and
>  .BR settimeofday ()
> -can get and set the time as well as a timezone.
> +can get and set the time as well as a time zone.
>  The
>  .I tv
>  argument is a
> @@ -160,7 +160,7 @@ Daylight Saving Time is in force cannot be given
>  by a simple algorithm, one per country; indeed,
>  this period is determined by unpredictable political
>  decisions.
> -So this method of representing timezones
> +So this method of representing time zones
>  has been abandoned.
>  Under Linux, in a call to
>  .BR settimeofday ()
> diff --git a/man3/ctime.3 b/man3/ctime.3
> index f31f3d9..75e2f76 100644
> --- a/man3/ctime.3
> +++ b/man3/ctime.3
> @@ -164,7 +164,7 @@ functions.
>  The function also sets the external
>  variables \fItzname\fP, \fItimezone\fP, and \fIdaylight\fP (see
>  .BR tzset (3))
> -with information about the current timezone.
> +with information about the current time zone.
>  The reentrant version
>  .BR ctime_r ()
>  does the same, but stores the
> @@ -190,11 +190,11 @@ The
>  .BR localtime ()
>  function converts the calendar time \fItimep\fP to
>  broken-time representation, expressed relative to the user's specified
> -timezone.
> +time zone.
>  The function acts as if it called
>  .BR tzset (3)
>  and sets the external variables \fItzname\fP with
> -information about the current timezone, \fItimezone\fP with the difference
> +information about the current time zone, \fItimezone\fP with the difference
>  between Coordinated Universal Time (UTC) and local standard time in
>  seconds, and \fIdaylight\fP to a non-zero value if daylight savings
>  time rules apply during some part of the year.
> @@ -240,7 +240,7 @@ a positive value means DST is in effect;
>  zero means that DST is not in effect;
>  and a negative value means that
>  .BR mktime ()
> -should (use timezone information and system databases to)
> +should (use time zone information and system databases to)
>  attempt to determine whether DST is in effect at the specified time.
>
>  The
> @@ -261,7 +261,7 @@ to indicate whether DST is or is not in effect at the specified time.
>  Calling
>  .BR mktime ()
>  also sets the external variable \fItzname\fP with
> -information about the current timezone.
> +information about the current time zone.
>
>  If the specified broken-down
>  time cannot be represented as calendar time (seconds since the Epoch),
> diff --git a/man3/ftime.3 b/man3/ftime.3
> index 4df11bd..ce01574 100644
> --- a/man3/ftime.3
> +++ b/man3/ftime.3
> @@ -56,7 +56,7 @@ struct timeb {
>  Here \fItime\fP is the number of seconds since the Epoch,
>  and \fImillitm\fP is the number of milliseconds since \fItime\fP
>  seconds since the Epoch.
> -The \fItimezone\fP field is the local timezone measured in minutes
> +The \fItimezone\fP field is the local time zone measured in minutes
>  of time west of Greenwich (with a negative value indicating minutes
>  east of Greenwich).
>  The \fIdstflag\fP field
> diff --git a/man3/getdate.3 b/man3/getdate.3
> index d87e1f0..28773aa 100644
> --- a/man3/getdate.3
> +++ b/man3/getdate.3
> @@ -87,7 +87,7 @@ When
>  .B %Z
>  is given, the structure containing the broken-down time
>  is initialized with values corresponding to the current
> -time in the given timezone.
> +time in the given time zone.
>  Otherwise, the structure is initialized to the broken-down time
>  corresponding to the current local time (as by a call to
>  .BR localtime (3)).
> diff --git a/man3/strftime.3 b/man3/strftime.3
> index 38f3afb..ee7b097 100644
> --- a/man3/strftime.3
> +++ b/man3/strftime.3
> @@ -48,7 +48,7 @@ The
>  function formats the broken-down time \fItm\fP
>  according to the format specification \fIformat\fP and places the
>  result in the character array \fIs\fP of size \fImax\fP.
> -.\" FIXME POSIX says: Local timezone information is used as though
> +.\" FIXME POSIX says: Local time zone information is used as though
>  .\" strftime() called tzset().  But this doesn't appear to be the case
>  .PP
>  The format specification is a null-terminated string and may contain
> @@ -250,7 +250,7 @@ The year as a decimal number including the century.
>  The +hhmm or -hhmm numeric time zone (that is, the hour and minute offset from UTC). (SU)
>  .TP
>  .B %Z
> -The timezone or name or abbreviation.
> +The time zone or name or abbreviation.
>  .TP
>  .B %+
>  .\" Nov 05 -- Not in Linux/glibc, but is in some BSDs (according to
> @@ -327,7 +327,7 @@ are used.
>  SVr4, C89, C99.
>  There are strict inclusions between the set of conversions
>  given in ANSI C (unmarked), those given in the Single Unix Specification
> -(marked SU), those given in Olson's timezone package (marked TZ),
> +(marked SU), those given in Olson's zoneinfo package (marked TZ),
>  and those given in glibc (marked GNU), except that
>  .B %+
>  is not supported in glibc2.
> diff --git a/man3/strptime.3 b/man3/strptime.3
> index 99897f1..aaba1d1 100644
> --- a/man3/strptime.3
> +++ b/man3/strptime.3
> @@ -352,10 +352,10 @@ Otherwise, it is the last week
>  of the previous year, and the next week is week 1.
>  .TP
>  .B %z
> -An RFC-822/ISO 8601 standard timezone specification.
> +An RFC-822/ISO 8601 standard time zone specification.
>  .TP
>  .B %Z
> -The timezone name.
> +The time zone name.
>  .LP
>  Similarly, because of GNU extensions to
>  .BR strftime (3),
> diff --git a/man3/sysconf.3 b/man3/sysconf.3
> index 690f904..0486bb0 100644
> --- a/man3/sysconf.3
> +++ b/man3/sysconf.3
> @@ -206,7 +206,7 @@ Must not be less than
>  (9).
>  .TP
>  .BR TZNAME_MAX " - " _SC_TZNAME_MAX
> -The maximum number of bytes in a timezone name.
> +The maximum number of bytes in a time zone name.
>  Must not be less than
>  .B _POSIX_TZNAME_MAX
>  (6).
> diff --git a/man3/tzset.3 b/man3/tzset.3
> index 1d74405..e8590b1 100644
> --- a/man3/tzset.3
> +++ b/man3/tzset.3
> @@ -65,9 +65,9 @@ function initializes the \fItzname\fP variable from the
>  .B TZ
>  environment variable.
>  This function is automatically called by the
> -other time conversion functions that depend on the timezone.
> +other time conversion functions that depend on the time zone.
>  In a System-V-like environment, it will also set the variables \fItimezone\fP
> -(to seconds West of UTC) and \fIdaylight\fP (to 0 if this timezone does not
> +(to seconds West of UTC) and \fIdaylight\fP (to 0 if this time zone does not
>  have any daylight saving time rules, or to non-zero if there is a time during
>  the year when daylight saving time applies).
>  .PP
> @@ -78,10 +78,10 @@ variable is initialized with the best approximation of local wall clock
>  time, as specified by the
>  .BR tzfile (5)-format
>  file \fIlocaltime\fP
> -found in the system timezone directory (see below).
> +found in the system time zone directory (see below).
>  (One also often sees
>  .I /etc/localtime
> -used here, a symlink to the right file in the system timezone directory.)
> +used here, a symlink to the right file in the system time zone directory.)
>  .PP
>  If the
>  .B TZ
> @@ -93,19 +93,19 @@ The value of
>  .B TZ
>  can be one of three formats.
>  The first format is used
> -when there is no daylight saving time in the local timezone:
> +when there is no daylight saving time in the local time zone:
>  .sp
>  .RS
>  .I std offset
>  .RE
>  .sp
> -The \fIstd\fP string specifies the name of the timezone and must be
> +The \fIstd\fP string specifies the name of the time zone and must be
>  three or more alphabetic characters.
>  The \fIoffset\fP string immediately
>  follows \fIstd\fP and specifies the time value to be added to the local
>  time to get Coordinated Universal Time (UTC).
>  The \fIoffset\fP is positive
> -if the local timezone is west of the Prime Meridian and negative if it is
> +if the local time zone is west of the Prime Meridian and negative if it is
>  east.
>  The hour must be between 0 and 24, and the minutes and seconds
>  0 and 59.
> @@ -118,9 +118,9 @@ The second format is used when there is daylight saving time:
>  .sp
>  There are no spaces in the specification.
>  The initial \fIstd\fP and
> -\fIoffset\fP specify the standard timezone, as described above.
> +\fIoffset\fP specify the standard time zone, as described above.
>  The \fIdst\fP string and \fIoffset\fP specify the name and offset for the
> -corresponding daylight saving timezone.
> +corresponding daylight saving time zone.
>  If the offset is omitted,
>  it default to one hour ahead of standard time.
>  .PP
> @@ -159,26 +159,26 @@ and the changeovers happen at the default time of 02:00:00:
>     TZ="NZST-12.00:00NZDT-13:00:00,M10.1.0,M3.3.0"
>  .fi
>  .PP
> -The third format specifies that the timezone information should be read
> +The third format specifies that the time zone information should be read
>  from a file:
>  .sp
>  .RS
>  :[filespec]
>  .RE
>  .sp
> -If the file specification \fIfilespec\fP is omitted, the timezone
> +If the file specification \fIfilespec\fP is omitted, the time zone
>  information is read from the file
>  .I localtime
> -in the system timezone directory, which nowadays usually is
> +in the system time zone directory, which nowadays usually is
>  .IR /usr/share/zoneinfo .
>  This file is in
>  .BR tzfile (5)
>  format.
>  If \fIfilespec\fP is given, it specifies another
>  .BR tzfile (5)-format
> -file to read the timezone information from.
> +file to read the time zone information from.
>  If \fIfilespec\fP does not begin with a \(aq/\(aq, the file specification is
> -relative to the system timezone directory.
> +relative to the system time zone directory.
>  .PP
>  Here's an example, once more for New Zealand:
>  .nf
> @@ -186,7 +186,7 @@ Here's an example, once more for New Zealand:
>     TZ=":Pacific/Auckland"
>  .fi
>  .SH FILES
> -The system timezone directory used depends on the (g)libc version.
> +The system time zone directory used depends on the (g)libc version.
>  Libc4 and libc5 use
>  .IR /usr/lib/zoneinfo ,
>  and, since libc-5.4.6,
> @@ -198,9 +198,9 @@ when that exists.
>  Its default depends on how it was installed, but normally is
>  .IR /usr/share/zoneinfo .
>  .LP
> -This timezone directory contains the files
> +This time zone directory contains the files
>  .nf
> -localtime      local timezone file
> +localtime      local time zone file
>  posixrules     rules for POSIX-style TZ's
>  .fi
>  .LP
> @@ -208,7 +208,7 @@ Often
>  .I /etc/localtime
>  is a symlink to the file
>  .I localtime
> -or to the correct timezone file in the system timezone directory.
> +or to the correct time zone file in the system time zone directory.
>  .SH "CONFORMING TO"
>  SVr4, POSIX.1-2001, 4.3BSD.
>  .SH NOTES
> @@ -222,7 +222,7 @@ It has been obsolete for many years but is required by SUSv2.
>  4.3BSD had a function
>  .BI "char *timezone(" zone ", " dst )
>  that returned the
> -name of the timezone corresponding to its first argument (minutes
> +name of the time zone corresponding to its first argument (minutes
>  West of UTC).
>  If the second argument was 0, the standard name was used,
>  otherwise the daylight saving time version.
> diff --git a/man5/tzfile.5 b/man5/tzfile.5
> index 1e41c7e..6ec7561 100644
> --- a/man5/tzfile.5
> +++ b/man5/tzfile.5
> @@ -3,14 +3,14 @@
>  .\" 1996-06-05 by Arthur David Olson <arthur_david_olson-2zaOuxCdfhg@public.gmane.org>.
>  .TH TZFILE 5 1996-06-05 "" "Linux Programmer's Manual"
>  .SH NAME
> -tzfile \- timezone information
> +tzfile \- time zone information
>  .SH SYNOPSIS
>  .B #include <tzfile.h>
>  .SH DESCRIPTION
> -The timezone information files used by
> +The time zone information files used by
>  .BR tzset (3)
>  begin with the magic characters "TZif" to identify then as
> -timezone information files,
> +time zone information files,
>  followed by sixteen bytes reserved for future use,
>  followed by six four-byte values of type
>  .IR long ,
> @@ -37,7 +37,7 @@ The number of "local time types" for which data is stored
>  in the file (must not be zero).
>  .TP
>  .I tzh_charcnt
> -The number of characters of "timezone abbreviation strings"
> +The number of characters of "time zone abbreviation strings"
>  stored in the file.
>  .PP
>  The above header is followed by
> @@ -88,7 +88,7 @@ should be set by
>  .BR localtime (3),
>  and
>  .I tt_abbrind
> -serves as an index into the array of timezone abbreviation characters
> +serves as an index into the array of time zone abbreviation characters
>  that follow the
>  .I ttinfo
>  structure(s) in the file.
> @@ -110,16 +110,16 @@ Then there are
>  standard/wall indicators, each stored as a one-byte value;
>  they tell whether the transition times associated with local time types
>  were specified as standard time or wall clock time,
> -and are used when a timezone file is used in handling POSIX-style
> -timezone environment variables.
> +and are used when a time zone file is used in handling POSIX-style
> +time zone environment variables.
>  .PP
>  Finally, there are
>  .I tzh_ttisgmtcnt
>  UTC/local indicators, each stored as a one-byte value;
>  they tell whether the transition times associated with local time types
>  were specified as UTC or local time,
> -and are used when a timezone file is used in handling POSIX-style
> -timezone environment variables.
> +and are used when a time zone file is used in handling POSIX-style
> +time zone environment variables.
>  .PP
>  .I Localtime
>  uses the first standard-time
> diff --git a/man7/environ.7 b/man7/environ.7
> index 2ffb12a..9929279 100644
> --- a/man7/environ.7
> +++ b/man7/environ.7
> @@ -163,7 +163,7 @@ to be used with
>  .BR gethostbyname (3).
>  .LP
>  .BR TZ " and " TZDIR
> -give timezone information used by
> +give time zone information used by
>  .BR tzset (3)
>  and through that by functions like
>  .BR ctime (3),
> diff --git a/man7/hier.7 b/man7/hier.7
> index 8acfbfe..e5e0b2e 100644
> --- a/man7/hier.7
> +++ b/man7/hier.7
> @@ -358,7 +358,7 @@ The database for terminfo.
>  Troff macros that are not distributed with groff.
>  .TP
>  .I /usr/share/zoneinfo
> -Files for timezone information.
> +Files for time zone information.
>  .TP
>  .I /usr/src
>  Source files for different parts of the system, included with some packages
> diff --git a/man8/tzselect.8 b/man8/tzselect.8
> index 717eaee..c843781 100644
> --- a/man8/tzselect.8
> +++ b/man8/tzselect.8
> @@ -2,21 +2,21 @@
>  .\"
>  .TH TZSELECT 8 2007-05-18 "" "Linux System Administration"
>  .SH NAME
> -tzselect \- select a timezone
> +tzselect \- select a time zone
>  .SH SYNOPSIS
>  .B tzselect
>  .SH DESCRIPTION
>  The
>  .B tzselect
>  program asks the user for information about the current location,
> -and outputs the resulting timezone description to standard output.
> +and outputs the resulting time zone description to standard output.
>  The output is suitable as a value for the
>  .B TZ
>  environment variable.
>  .PP
>  All interaction with the user is done via standard input and standard error.
>  .SH "EXIT STATUS"
> -The exit status is zero if a timezone was successfully obtained
> +The exit status is zero if a time zone was successfully obtained
>  from the user, non-zero otherwise.
>  .SH ENVIRONMENT
>  .TP
> @@ -27,7 +27,7 @@ program (default:
>  .BR awk ).
>  .TP
>  \fBTZDIR\fP
> -Name of the directory containing timezone data files (default:
> +Name of the directory containing time zone data files (default:
>  .IR /usr/share/zoneinfo ).
>  .\" or perhaps /usr/local/etc/zoneinfo in some older systems.
>  .SH FILES
> @@ -40,7 +40,7 @@ Table of country codes, latitude and longitude, TZ values, and
>  descriptive comments.
>  .TP
>  \fBTZDIR\fP\fI/\fP\fITZ\fP
> -Time zone data file for timezone \fITZ\fP.
> +Time zone data file for time zone \fITZ\fP.
>  .SH "SEE ALSO"
>  .BR tzfile (5),
>  .BR zdump (8),
> diff --git a/man8/zdump.8 b/man8/zdump.8
> index d9e9d7e..f216569 100644
> --- a/man8/zdump.8
> +++ b/man8/zdump.8
> @@ -2,7 +2,7 @@
>  .\"
>  .TH ZDUMP 8 2007-05-18 "" "Linux System Administration"
>  .SH NAME
> -zdump \- timezone dumper
> +zdump \- time zone dumper
>  .SH SYNOPSIS
>  .B zdump
>  [
> diff --git a/man8/zic.8 b/man8/zic.8
> index 8cb63bb..1d09884 100644
> --- a/man8/zic.8
> +++ b/man8/zic.8
> @@ -2,7 +2,7 @@
>  .\"
>  .TH ZIC 8 2007-05-18 "" "Linux System Administration"
>  .SH NAME
> -zic \- timezone compiler
> +zic \- time zone compiler
>  .SH SYNOPSIS
>  .B zic
>  [
> @@ -51,7 +51,7 @@ Create time conversion information files in the named directory rather than
>  in the standard directory named below.
>  .TP
>  .BI "\-l " timezone
> -Use the given timezone as local time.
> +Use the given time zone as local time.
>  .I Zic
>  will act as if the input contained a link line of the form
>  .sp
> @@ -59,8 +59,8 @@ will act as if the input contained a link line of the form
>  Link   \fItimezone\fP          localtime
>  .TP
>  .BI "\-p " timezone
> -Use the given timezone's rules when handling POSIX-format
> -timezone environment variables.
> +Use the given time zone's rules when handling POSIX-format
> +time zone environment variables.
>  .I Zic
>  will act as if the input contained a link line of the form
>  .sp
> @@ -251,7 +251,7 @@ in
>  .q EST
>  or
>  .q EDT )
> -of timezone abbreviations to be used when this rule is in effect.
> +of time zone abbreviations to be used when this rule is in effect.
>  If this field is
>  .BR \- ,
>  the variable part is null.
> @@ -272,7 +272,7 @@ Zone        Australia/Adelaide      9:30    Aus     CST     1971 Oct 31 2:00
>  The fields that make up a zone line are:
>  .TP "\w'UTC_OFFSET'u"
>  .B NAME
> -The name of the timezone.
> +The name of the time zone.
>  This is the name used in creating the time conversion information file for the
>  zone.
>  .TP
> @@ -286,19 +286,19 @@ fields of rule lines;
>  begin the field with a minus sign if time must be subtracted from UTC.
>  .TP
>  .B RULES/SAVE
> -The name of the rule(s) that apply in the timezone or,
> +The name of the rule(s) that apply in the time zone or,
>  alternately, an amount of time to add to local standard time.
>  If this field is
>  .B \-
> -then standard time always applies in the timezone.
> +then standard time always applies in the time zone.
>  .TP
>  .B FORMAT
> -The format for timezone abbreviations in this timezone.
> +The format for time zone abbreviations in this time zone.
>  The pair of characters
>  .B %s
>  is used to show where the
>  .q "variable part"
> -of the timezone abbreviation goes.
> +of the time zone abbreviation goes.
>  Alternately,
>  a slash (/)
>  separates standard and daylight abbreviations.
> @@ -307,7 +307,7 @@ separates standard and daylight abbreviations.
>  The time at which the UTC offset or the rule(s) change for a location.
>  It is specified as a year, a month, a day, and a time of day.
>  If this is specified,
> -the timezone information is generated from the given UTC offset
> +the time zone information is generated from the given UTC offset
>  and rule change until the time specified.
>  The month, day, and time of day have the same format as the IN, ON, and AT
>  columns of a rule; trailing columns can be omitted, and default to the
> --
> 1.6.6.102.gd6f8f
>
>



-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Author of "The Linux Programming Interface" http://blog.man7.org/
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 8/9] Consistently define the Epoch

[Michael Witten]

All definitions of the Epoch have been refactored to the following:

  1970-01-01 00:00:00 +0000 (UTC)

That form is more consistent, logical, precise, and internationally
recognizable than the other variants.

Also, some wording has been altered as well.

Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 man2/stime.2      |    4 ++--
 man2/time.2       |    4 ++--
 man2/utimensat.2  |    6 +++---
 man3/ctime.3      |    3 +--
 man3/difftime.3   |    6 +++---
 man3/ftime.3      |    4 ++--
 man3/getspnam.3   |    4 ++--
 man3/mq_receive.3 |    2 +-
 man3/mq_send.3    |    2 +-
 man3/rtime.3      |    4 ++--
 man3/sem_wait.3   |    2 +-
 man3/strftime.3   |    3 +--
 man3/strptime.3   |    3 +--
 man3/timeradd.3   |    3 +--
 man4/rtc.4        |    2 +-
 man5/core.5       |    2 +-
 man5/proc.5       |    2 +-
 man7/icmp.7       |    2 +-
 man7/time.7       |    2 +-
 19 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/man2/stime.2 b/man2/stime.2
index 530d223..534e297 100644
--- a/man2/stime.2
+++ b/man2/stime.2
@@ -45,8 +45,8 @@ _SVID_SOURCE
 .SH DESCRIPTION
 .BR stime ()
 sets the system's idea of the time and date.
-Time, pointed
-to by \fIt\fP, is measured in seconds from 00:00:00 UTC January 1, 1970.
+The time, pointed
+to by \fIt\fP, is measured in seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
 .BR stime ()
 may only be executed by the superuser.
 .SH "RETURN VALUE"
diff --git a/man2/time.2 b/man2/time.2
index 5fae9d9..c4b7679 100644
--- a/man2/time.2
+++ b/man2/time.2
@@ -35,8 +35,8 @@ time \- get time in seconds
 .BI "time_t time(time_t *" t );
 .SH DESCRIPTION
 .BR time ()
-returns the time since the Epoch
-(00:00:00 UTC, January 1, 1970), measured in seconds.
+returns the time as the number of seconds since the Epoch,
+1970-01-01 00:00:00 +0000 (UTC).
 
 If
 .I t
diff --git a/man2/utimensat.2 b/man2/utimensat.2
index a87e66e..76725b2 100644
--- a/man2/utimensat.2
+++ b/man2/utimensat.2
@@ -78,9 +78,9 @@ specifies the new "last access time" (\fIatime\fP);
 specifies the new "last modification time" (\fImtime\fP).
 Each of the elements of
 .I times
-specifies a time in seconds and nanoseconds
-since the Epoch (00:00:00, 1 Jan 1970, UTC),
-in a structure of the following form:
+specifies a time as the the number of seconds and nanoseconds
+since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
+This information is conveyed in a structure of the following form:
 .in +4n
 .nf
 
diff --git a/man3/ctime.3 b/man3/ctime.3
index 75e2f76..132c364 100644
--- a/man3/ctime.3
+++ b/man3/ctime.3
@@ -78,8 +78,7 @@ and
 functions all take
 an argument of data type \fItime_t\fP which represents calendar time.
 When interpreted as an absolute time value, it represents the number of
-seconds elapsed since 00:00:00 on January 1, 1970, Coordinated Universal
-Time (UTC).
+seconds elapsed since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
 .PP
 The
 .BR asctime ()
diff --git a/man3/difftime.3 b/man3/difftime.3
index 5567751..79887b1 100644
--- a/man3/difftime.3
+++ b/man3/difftime.3
@@ -40,9 +40,9 @@ The
 function returns the number of seconds elapsed
 between time \fItime1\fP and time \fItime0\fP, represented as a
 .IR double .
-The two times are specified in calendar time, which represents the time
-elapsed since the Epoch
-(00:00:00 on January 1, 1970, Coordinated Universal Time (UTC)).
+Each of the times is specified in calendar time, which means its
+value is a measurement (in seconds) relative to the Epoch,
+1970-01-01 00:00:00 +0000 (UTC).
 .SH "CONFORMING TO"
 SVr4, 4.3BSD, C89, C99.
 .SH NOTES
diff --git a/man3/ftime.3 b/man3/ftime.3
index ce01574..2304b9a 100644
--- a/man3/ftime.3
+++ b/man3/ftime.3
@@ -36,8 +36,8 @@ ftime \- return date and time
 .sp
 .BI "int ftime(struct timeb *" tp );
 .SH DESCRIPTION
-This function returns the current time, in seconds and milliseconds
-since the Epoch (00:00:00 UTC, 1 January 1970).
+This function returns the current time as seconds and milliseconds
+since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
 The time is returned in
 .IR tp ,
 which is declared as follows:
diff --git a/man3/getspnam.3 b/man3/getspnam.3
index fdfc1fb..d4ca057 100644
--- a/man3/getspnam.3
+++ b/man3/getspnam.3
@@ -194,7 +194,7 @@ struct spwd {
     char *sp_namp;     /* Login name */
     char *sp_pwdp;     /* Encrypted password */
     long  sp_lstchg;   /* Date of last change (measured
-                          in days since 1 Jan 1970) */
+                          in days since 1970-01-01 00:00:00 +0000 (UTC)) */
     long  sp_min;      /* Min # of days between changes */
     long  sp_max;      /* Max # of days between changes */
     long  sp_warn;     /* # of days before password expires
@@ -202,7 +202,7 @@ struct spwd {
     long  sp_inact;    /* # of days after password expires
                           until account is disabled */
     long  sp_expire;   /* Date when account expires (measured
-                          in days since 1 Jan 1970) */
+                          in days since 1970-01-01 00:00:00 +0000 (UTC)) */
     unsigned long sp_flag;  /* Reserved */
 };
 .fi
diff --git a/man3/mq_receive.3 b/man3/mq_receive.3
index 32343a0..9a55812 100644
--- a/man3/mq_receive.3
+++ b/man3/mq_receive.3
@@ -83,7 +83,7 @@ flag is not enabled for the message queue description, then
 points to a structure which specifies a ceiling on the time for which
 the call will block.
 This ceiling is an absolute timeout in seconds and nanoseconds
-since the Epoch (midnight on the morning of 1 January 1970),
+since the Epoch, 1970-01-01 00:00:00 +0000 (UTC), and it is
 specified in the following structure:
 .sp
 .in +4n
diff --git a/man3/mq_send.3 b/man3/mq_send.3
index 3271d88..52eda2a 100644
--- a/man3/mq_send.3
+++ b/man3/mq_send.3
@@ -89,7 +89,7 @@ flag is not enabled for the message queue description, then
 points to a structure which specifies a ceiling on the time for which
 the call will block.
 This ceiling is an absolute timeout in seconds and nanoseconds
-since the Epoch (midnight on the morning of 1 January 1970),
+since the Epoch, 1970-01-01 00:00:00 +0000 (UTC), and it is
 specified in the following structure:
 .sp
 .in +4n
diff --git a/man3/rtime.3 b/man3/rtime.3
index 24be759..cd84f44 100644
--- a/man3/rtime.3
+++ b/man3/rtime.3
@@ -22,8 +22,8 @@ RFC\ 868 to obtain the time from a remote machine.
 The Time Server Protocol gives the time in seconds since
 00:00:00 UTC, 1 Jan 1900,
 and this function subtracts the appropriate constant in order to
-convert the result to seconds since
-00:00:00 UTC, 1 Jan 1970, the Unix Epoch.
+convert the result to seconds since the Epoch,
+1970-01-01 00:00:00 +0000 (UTC).
 .LP
 When
 .I timeout
diff --git a/man3/sem_wait.3 b/man3/sem_wait.3
index 526f57d..062e436 100644
--- a/man3/sem_wait.3
+++ b/man3/sem_wait.3
@@ -77,7 +77,7 @@ should block if the decrement cannot be immediately performed.
 The
 .I abs_timeout
 argument points to a structure that specifies an absolute timeout
-in seconds and nanoseconds since the Epoch (00:00:00, 1 January 1970).
+in seconds and nanoseconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
 This structure is defined as follows:
 
 .nf
diff --git a/man3/strftime.3 b/man3/strftime.3
index ee7b097..89b3a32 100644
--- a/man3/strftime.3
+++ b/man3/strftime.3
@@ -187,8 +187,7 @@ For a version including the seconds, see
 below.
 .TP
 .B %s
-The number of seconds since the Epoch, that is, since 1970-01-01
-00:00:00 UTC. (TZ)
+The number of seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC). (TZ)
 .TP
 .B %S
 The second as a decimal number (range 00 to 60).
diff --git a/man3/strptime.3 b/man3/strptime.3
index aaba1d1..37b5fcb 100644
--- a/man3/strptime.3
+++ b/man3/strptime.3
@@ -374,8 +374,7 @@ is accepted as a synonym for
 Finally
 .TP
 .B %s
-The number of seconds since the Epoch,
-that is, since 1970-01-01 00:00:00 UTC.
+The number of seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
 Leap seconds are not counted unless leap second support is available.
 .LP
 The glibc implementation does not require whitespace between
diff --git a/man3/timeradd.3 b/man3/timeradd.3
index 869b9e7..67a7fb5 100644
--- a/man3/timeradd.3
+++ b/man3/timeradd.3
@@ -96,8 +96,7 @@ zeros out the
 .I timeval
 structure pointed to by
 .IR tvp ,
-so that it represents the time at midnight
-on the morning of 1 January 1970 (the Epoch).
+so that it represents the Epoch: 1970-01-01 00:00:00 +0000 (UTC).
 
 .BR timerisset ()
 returns true (non-zero) if either field of the
diff --git a/man4/rtc.4 b/man4/rtc.4
index c4578b3..77ba983 100644
--- a/man4/rtc.4
+++ b/man4/rtc.4
@@ -59,7 +59,7 @@ and
 .BR time (2),
 as well as setting timestamps on files, etc.
 The system clock reports seconds and microseconds since a start point,
-defined to be the POSIX Epoch: Jan 1, 1970, 0:00 UTC.
+defined to be the POSIX Epoch: 1970-01-01 00:00:00 +0000 (UTC).
 (One common implementation counts timer interrupts, once
 per "jiffy", at a frequency of 100, 250, or 1000 Hz.)
 That is, it is supposed to report wall clock time, which RTCs also do.
diff --git a/man5/core.5 b/man5/core.5
index 886e88a..2d417f0 100644
--- a/man5/core.5
+++ b/man5/core.5
@@ -125,7 +125,7 @@ PID of dumped process
 number of signal causing dump
 .TP
 %t
-time of dump, expressed as seconds since the Epoch (00:00h, 1\ Jan 1970, UTC)
+time of dump, expressed as seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC)
 .TP
 %h
 hostname (same as \fInodename\fP returned by \fBuname\fP(2))
diff --git a/man5/proc.5 b/man5/proc.5
index 3da30af..a9b24ff 100644
--- a/man5/proc.5
+++ b/man5/proc.5
@@ -1683,7 +1683,7 @@ each subsequent column is the total for a particular interrupt.
 The number of context switches that the system underwent.
 .TP
 \fIbtime 769041601\fP
-boot time, in seconds since the Epoch (January 1, 1970).
+boot time, in seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
 .TP
 \fIprocesses 86031\fP
 Number of forks since boot.
diff --git a/man7/icmp.7 b/man7/icmp.7
index c5b676a..e777023 100644
--- a/man7/icmp.7
+++ b/man7/icmp.7
@@ -176,7 +176,7 @@ routing table and the redirect routes are expired after some time.
 .PP
 The 64-bit timestamp returned by
 .B ICMP_TIMESTAMP
-is in milliseconds since January 1, 1970.
+is in milliseconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
 .PP
 Linux ICMP internally uses a raw socket to send ICMPs.
 This raw socket may appear in
diff --git a/man7/time.7 b/man7/time.7
index 69c08cd..7c22da0 100644
--- a/man7/time.7
+++ b/man7/time.7
@@ -124,7 +124,7 @@ HRTs are not supported on all hardware architectures.
 .SS "The Epoch"
 Unix systems represent time in seconds since the
 .IR Epoch ,
-which is defined as 0:00:00 UTC on the morning of 1 January 1970.
+1970-01-01 00:00:00 +0000 (UTC).
 
 A program can determine the
 .I "calendar time"
-- 
1.6.6.102.gd6f8f

--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 8/9] Consistently define the Epoch

[Michael Kerrisk]

Hi Michael

On Sun, Jan 10, 2010 at 12:45 PM, Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> All definitions of the Epoch have been refactored to the following:
>
>  1970-01-01 00:00:00 +0000 (UTC)
>
> That form is more consistent, logical, precise, and internationally
> recognizable than the other variants.
>
> Also, some wording has been altered as well.

Thanks! Applied.

Cheers,

Michael


> Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  man2/stime.2      |    4 ++--
>  man2/time.2       |    4 ++--
>  man2/utimensat.2  |    6 +++---
>  man3/ctime.3      |    3 +--
>  man3/difftime.3   |    6 +++---
>  man3/ftime.3      |    4 ++--
>  man3/getspnam.3   |    4 ++--
>  man3/mq_receive.3 |    2 +-
>  man3/mq_send.3    |    2 +-
>  man3/rtime.3      |    4 ++--
>  man3/sem_wait.3   |    2 +-
>  man3/strftime.3   |    3 +--
>  man3/strptime.3   |    3 +--
>  man3/timeradd.3   |    3 +--
>  man4/rtc.4        |    2 +-
>  man5/core.5       |    2 +-
>  man5/proc.5       |    2 +-
>  man7/icmp.7       |    2 +-
>  man7/time.7       |    2 +-
>  19 files changed, 28 insertions(+), 32 deletions(-)
>
> diff --git a/man2/stime.2 b/man2/stime.2
> index 530d223..534e297 100644
> --- a/man2/stime.2
> +++ b/man2/stime.2
> @@ -45,8 +45,8 @@ _SVID_SOURCE
>  .SH DESCRIPTION
>  .BR stime ()
>  sets the system's idea of the time and date.
> -Time, pointed
> -to by \fIt\fP, is measured in seconds from 00:00:00 UTC January 1, 1970.
> +The time, pointed
> +to by \fIt\fP, is measured in seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
>  .BR stime ()
>  may only be executed by the superuser.
>  .SH "RETURN VALUE"
> diff --git a/man2/time.2 b/man2/time.2
> index 5fae9d9..c4b7679 100644
> --- a/man2/time.2
> +++ b/man2/time.2
> @@ -35,8 +35,8 @@ time \- get time in seconds
>  .BI "time_t time(time_t *" t );
>  .SH DESCRIPTION
>  .BR time ()
> -returns the time since the Epoch
> -(00:00:00 UTC, January 1, 1970), measured in seconds.
> +returns the time as the number of seconds since the Epoch,
> +1970-01-01 00:00:00 +0000 (UTC).
>
>  If
>  .I t
> diff --git a/man2/utimensat.2 b/man2/utimensat.2
> index a87e66e..76725b2 100644
> --- a/man2/utimensat.2
> +++ b/man2/utimensat.2
> @@ -78,9 +78,9 @@ specifies the new "last access time" (\fIatime\fP);
>  specifies the new "last modification time" (\fImtime\fP).
>  Each of the elements of
>  .I times
> -specifies a time in seconds and nanoseconds
> -since the Epoch (00:00:00, 1 Jan 1970, UTC),
> -in a structure of the following form:
> +specifies a time as the the number of seconds and nanoseconds
> +since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
> +This information is conveyed in a structure of the following form:
>  .in +4n
>  .nf
>
> diff --git a/man3/ctime.3 b/man3/ctime.3
> index 75e2f76..132c364 100644
> --- a/man3/ctime.3
> +++ b/man3/ctime.3
> @@ -78,8 +78,7 @@ and
>  functions all take
>  an argument of data type \fItime_t\fP which represents calendar time.
>  When interpreted as an absolute time value, it represents the number of
> -seconds elapsed since 00:00:00 on January 1, 1970, Coordinated Universal
> -Time (UTC).
> +seconds elapsed since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
>  .PP
>  The
>  .BR asctime ()
> diff --git a/man3/difftime.3 b/man3/difftime.3
> index 5567751..79887b1 100644
> --- a/man3/difftime.3
> +++ b/man3/difftime.3
> @@ -40,9 +40,9 @@ The
>  function returns the number of seconds elapsed
>  between time \fItime1\fP and time \fItime0\fP, represented as a
>  .IR double .
> -The two times are specified in calendar time, which represents the time
> -elapsed since the Epoch
> -(00:00:00 on January 1, 1970, Coordinated Universal Time (UTC)).
> +Each of the times is specified in calendar time, which means its
> +value is a measurement (in seconds) relative to the Epoch,
> +1970-01-01 00:00:00 +0000 (UTC).
>  .SH "CONFORMING TO"
>  SVr4, 4.3BSD, C89, C99.
>  .SH NOTES
> diff --git a/man3/ftime.3 b/man3/ftime.3
> index ce01574..2304b9a 100644
> --- a/man3/ftime.3
> +++ b/man3/ftime.3
> @@ -36,8 +36,8 @@ ftime \- return date and time
>  .sp
>  .BI "int ftime(struct timeb *" tp );
>  .SH DESCRIPTION
> -This function returns the current time, in seconds and milliseconds
> -since the Epoch (00:00:00 UTC, 1 January 1970).
> +This function returns the current time as seconds and milliseconds
> +since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
>  The time is returned in
>  .IR tp ,
>  which is declared as follows:
> diff --git a/man3/getspnam.3 b/man3/getspnam.3
> index fdfc1fb..d4ca057 100644
> --- a/man3/getspnam.3
> +++ b/man3/getspnam.3
> @@ -194,7 +194,7 @@ struct spwd {
>     char *sp_namp;     /* Login name */
>     char *sp_pwdp;     /* Encrypted password */
>     long  sp_lstchg;   /* Date of last change (measured
> -                          in days since 1 Jan 1970) */
> +                          in days since 1970-01-01 00:00:00 +0000 (UTC)) */
>     long  sp_min;      /* Min # of days between changes */
>     long  sp_max;      /* Max # of days between changes */
>     long  sp_warn;     /* # of days before password expires
> @@ -202,7 +202,7 @@ struct spwd {
>     long  sp_inact;    /* # of days after password expires
>                           until account is disabled */
>     long  sp_expire;   /* Date when account expires (measured
> -                          in days since 1 Jan 1970) */
> +                          in days since 1970-01-01 00:00:00 +0000 (UTC)) */
>     unsigned long sp_flag;  /* Reserved */
>  };
>  .fi
> diff --git a/man3/mq_receive.3 b/man3/mq_receive.3
> index 32343a0..9a55812 100644
> --- a/man3/mq_receive.3
> +++ b/man3/mq_receive.3
> @@ -83,7 +83,7 @@ flag is not enabled for the message queue description, then
>  points to a structure which specifies a ceiling on the time for which
>  the call will block.
>  This ceiling is an absolute timeout in seconds and nanoseconds
> -since the Epoch (midnight on the morning of 1 January 1970),
> +since the Epoch, 1970-01-01 00:00:00 +0000 (UTC), and it is
>  specified in the following structure:
>  .sp
>  .in +4n
> diff --git a/man3/mq_send.3 b/man3/mq_send.3
> index 3271d88..52eda2a 100644
> --- a/man3/mq_send.3
> +++ b/man3/mq_send.3
> @@ -89,7 +89,7 @@ flag is not enabled for the message queue description, then
>  points to a structure which specifies a ceiling on the time for which
>  the call will block.
>  This ceiling is an absolute timeout in seconds and nanoseconds
> -since the Epoch (midnight on the morning of 1 January 1970),
> +since the Epoch, 1970-01-01 00:00:00 +0000 (UTC), and it is
>  specified in the following structure:
>  .sp
>  .in +4n
> diff --git a/man3/rtime.3 b/man3/rtime.3
> index 24be759..cd84f44 100644
> --- a/man3/rtime.3
> +++ b/man3/rtime.3
> @@ -22,8 +22,8 @@ RFC\ 868 to obtain the time from a remote machine.
>  The Time Server Protocol gives the time in seconds since
>  00:00:00 UTC, 1 Jan 1900,
>  and this function subtracts the appropriate constant in order to
> -convert the result to seconds since
> -00:00:00 UTC, 1 Jan 1970, the Unix Epoch.
> +convert the result to seconds since the Epoch,
> +1970-01-01 00:00:00 +0000 (UTC).
>  .LP
>  When
>  .I timeout
> diff --git a/man3/sem_wait.3 b/man3/sem_wait.3
> index 526f57d..062e436 100644
> --- a/man3/sem_wait.3
> +++ b/man3/sem_wait.3
> @@ -77,7 +77,7 @@ should block if the decrement cannot be immediately performed.
>  The
>  .I abs_timeout
>  argument points to a structure that specifies an absolute timeout
> -in seconds and nanoseconds since the Epoch (00:00:00, 1 January 1970).
> +in seconds and nanoseconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
>  This structure is defined as follows:
>
>  .nf
> diff --git a/man3/strftime.3 b/man3/strftime.3
> index ee7b097..89b3a32 100644
> --- a/man3/strftime.3
> +++ b/man3/strftime.3
> @@ -187,8 +187,7 @@ For a version including the seconds, see
>  below.
>  .TP
>  .B %s
> -The number of seconds since the Epoch, that is, since 1970-01-01
> -00:00:00 UTC. (TZ)
> +The number of seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC). (TZ)
>  .TP
>  .B %S
>  The second as a decimal number (range 00 to 60).
> diff --git a/man3/strptime.3 b/man3/strptime.3
> index aaba1d1..37b5fcb 100644
> --- a/man3/strptime.3
> +++ b/man3/strptime.3
> @@ -374,8 +374,7 @@ is accepted as a synonym for
>  Finally
>  .TP
>  .B %s
> -The number of seconds since the Epoch,
> -that is, since 1970-01-01 00:00:00 UTC.
> +The number of seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
>  Leap seconds are not counted unless leap second support is available.
>  .LP
>  The glibc implementation does not require whitespace between
> diff --git a/man3/timeradd.3 b/man3/timeradd.3
> index 869b9e7..67a7fb5 100644
> --- a/man3/timeradd.3
> +++ b/man3/timeradd.3
> @@ -96,8 +96,7 @@ zeros out the
>  .I timeval
>  structure pointed to by
>  .IR tvp ,
> -so that it represents the time at midnight
> -on the morning of 1 January 1970 (the Epoch).
> +so that it represents the Epoch: 1970-01-01 00:00:00 +0000 (UTC).
>
>  .BR timerisset ()
>  returns true (non-zero) if either field of the
> diff --git a/man4/rtc.4 b/man4/rtc.4
> index c4578b3..77ba983 100644
> --- a/man4/rtc.4
> +++ b/man4/rtc.4
> @@ -59,7 +59,7 @@ and
>  .BR time (2),
>  as well as setting timestamps on files, etc.
>  The system clock reports seconds and microseconds since a start point,
> -defined to be the POSIX Epoch: Jan 1, 1970, 0:00 UTC.
> +defined to be the POSIX Epoch: 1970-01-01 00:00:00 +0000 (UTC).
>  (One common implementation counts timer interrupts, once
>  per "jiffy", at a frequency of 100, 250, or 1000 Hz.)
>  That is, it is supposed to report wall clock time, which RTCs also do.
> diff --git a/man5/core.5 b/man5/core.5
> index 886e88a..2d417f0 100644
> --- a/man5/core.5
> +++ b/man5/core.5
> @@ -125,7 +125,7 @@ PID of dumped process
>  number of signal causing dump
>  .TP
>  %t
> -time of dump, expressed as seconds since the Epoch (00:00h, 1\ Jan 1970, UTC)
> +time of dump, expressed as seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC)
>  .TP
>  %h
>  hostname (same as \fInodename\fP returned by \fBuname\fP(2))
> diff --git a/man5/proc.5 b/man5/proc.5
> index 3da30af..a9b24ff 100644
> --- a/man5/proc.5
> +++ b/man5/proc.5
> @@ -1683,7 +1683,7 @@ each subsequent column is the total for a particular interrupt.
>  The number of context switches that the system underwent.
>  .TP
>  \fIbtime 769041601\fP
> -boot time, in seconds since the Epoch (January 1, 1970).
> +boot time, in seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
>  .TP
>  \fIprocesses 86031\fP
>  Number of forks since boot.
> diff --git a/man7/icmp.7 b/man7/icmp.7
> index c5b676a..e777023 100644
> --- a/man7/icmp.7
> +++ b/man7/icmp.7
> @@ -176,7 +176,7 @@ routing table and the redirect routes are expired after some time.
>  .PP
>  The 64-bit timestamp returned by
>  .B ICMP_TIMESTAMP
> -is in milliseconds since January 1, 1970.
> +is in milliseconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
>  .PP
>  Linux ICMP internally uses a raw socket to send ICMPs.
>  This raw socket may appear in
> diff --git a/man7/time.7 b/man7/time.7
> index 69c08cd..7c22da0 100644
> --- a/man7/time.7
> +++ b/man7/time.7
> @@ -124,7 +124,7 @@ HRTs are not supported on all hardware architectures.
>  .SS "The Epoch"
>  Unix systems represent time in seconds since the
>  .IR Epoch ,
> -which is defined as 0:00:00 UTC on the morning of 1 January 1970.
> +1970-01-01 00:00:00 +0000 (UTC).
>
>  A program can determine the
>  .I "calendar time"
> --
> 1.6.6.102.gd6f8f
>
>



-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Author of "The Linux Programming Interface" http://blog.man7.org/
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 9/9] "null terminated" -> "null-terminated"

[Michael Witten]

The preferred spelling seems to be "null-terminated".

  fts.3           : "NULL-" -> "null-"
  getnetent.3     : "NULL-" -> "null-"
  getprotoent.3   : "NULL-" -> "null-"
  getrpcent.3     : "NULL-" -> "null-"
  getservent.3    : "NULL-" -> "null-"
  getsubopt.3     : "NULL-" -> "null-"
  putgrent.3      : "NULL " -> "null-"
  strcat.3        : "null " -> "null-"
  strcpy.3        : "null " -> "null-"
  console_ioctl.4 : "NULL " -> "null-"

Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 man3/fts.3           |    8 ++++----
 man3/getnetent.3     |    2 +-
 man3/getprotoent.3   |    2 +-
 man3/getrpcent.3     |    2 +-
 man3/getservent.3    |    2 +-
 man3/getsubopt.3     |    2 +-
 man3/putgrent.3      |    2 +-
 man3/strcat.3        |    4 ++--
 man3/strcpy.3        |    2 +-
 man4/console_ioctl.4 |    2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/man3/fts.3 b/man3/fts.3
index 7927544..e7fc193 100644
--- a/man3/fts.3
+++ b/man3/fts.3
@@ -309,7 +309,7 @@ Upon return from the
 .BR fts_children ()
 function, the
 .I fts_link
-field points to the next structure in the NULL-terminated linked list of
+field points to the next structure in the null-terminated linked list of
 directory members.
 Otherwise, the contents of the
 .I fts_link
@@ -344,7 +344,7 @@ Therefore, the
 and
 .I fts_accpath
 fields are guaranteed to be
-NULL-terminated
+null-terminated
 .I only
 for the file most recently returned by
 .BR fts_read ().
@@ -362,7 +362,7 @@ are attempted.
 The
 .I fts_name
 field is always
-NULL-terminated.
+null-terminated.
 .SS fts_open()
 The
 .BR fts_open ()
@@ -572,7 +572,7 @@ The
 .BR fts_children ()
 function returns a pointer to an
 .I FTSENT
-structure describing the first entry in a NULL-terminated linked list of
+structure describing the first entry in a null-terminated linked list of
 the files in the directory represented by the
 .I FTSENT
 structure most recently returned by
diff --git a/man3/getnetent.3 b/man3/getnetent.3
index 72b3efa..a6dbfa6 100644
--- a/man3/getnetent.3
+++ b/man3/getnetent.3
@@ -100,7 +100,7 @@ The members of the \fInetent\fP structure are:
 The official name of the network.
 .TP
 .I n_aliases
-A NULL-terminated list of alternative names for the network.
+A null-terminated list of alternative names for the network.
 .TP
 .I n_addrtype
 The type of the network number; always
diff --git a/man3/getprotoent.3 b/man3/getprotoent.3
index 05c1d7c..2492983 100644
--- a/man3/getprotoent.3
+++ b/man3/getprotoent.3
@@ -98,7 +98,7 @@ The members of the \fIprotoent\fP structure are:
 The official name of the protocol.
 .TP
 .I p_aliases
-A NULL-terminated list of alternative names for the protocol.
+A null-terminated list of alternative names for the protocol.
 .TP
 .I p_proto
 The protocol number.
diff --git a/man3/getrpcent.3 b/man3/getrpcent.3
index 8135c16..ee56f04 100644
--- a/man3/getrpcent.3
+++ b/man3/getrpcent.3
@@ -46,7 +46,7 @@ The members of this structure are:
 The name of the server for this RPC program.
 .TP
 .I r_aliases
-A NULL-terminated list of alternate names for the RPC program.
+A null-terminated list of alternate names for the RPC program.
 .TP
 .I r_number
 The RPC program number for this service.
diff --git a/man3/getservent.3 b/man3/getservent.3
index 27df7af..b073ad7 100644
--- a/man3/getservent.3
+++ b/man3/getservent.3
@@ -106,7 +106,7 @@ The members of the \fIservent\fP structure are:
 The official name of the service.
 .TP
 .I s_aliases
-A NULL-terminated list of alternative names for the service.
+A null-terminated list of alternative names for the service.
 .TP
 .I s_port
 The port number for the service given in network byte order.
diff --git a/man3/getsubopt.3 b/man3/getsubopt.3
index e4ffd59..49dff25 100644
--- a/man3/getsubopt.3
+++ b/man3/getsubopt.3
@@ -51,7 +51,7 @@ that might be passed in
 
 The
 .I tokens
-argument is a pointer to a NULL-terminated list of the tokens that
+argument is a pointer to a null-terminated list of the tokens that
 .BR getsubopt ()
 will look for in
 .IR optionp .
diff --git a/man3/putgrent.3 b/man3/putgrent.3
index 522716b..a33e3df 100644
--- a/man3/putgrent.3
+++ b/man3/putgrent.3
@@ -18,7 +18,7 @@ function is the counterpart for
 The function writes the content of the provided \fIstruct group\fP into the
 file pointed to by
 .IR fp .
-The list of group members must be NULL terminated or NULL initialized.
+The list of group members must be null-terminated or null-initialized.
 .sp
 The \fIstruct group\fP is defined as follows:
 .sp
diff --git a/man3/strcat.3 b/man3/strcat.3
index eed90ea..26f8025 100644
--- a/man3/strcat.3
+++ b/man3/strcat.3
@@ -53,12 +53,12 @@ function is similar, except that
 .IP * 3
 it will use at most \fIn\fP characters from \fIsrc\fP; and
 .IP *
-\fIsrc\fP does not need to be null terminated if it contains
+\fIsrc\fP does not need to be null-terminated if it contains
 \fIn\fP or more characters.
 .PP
 As with
 .BR strcat (),
-the resulting string in \fIdest\fP is always null terminated.
+the resulting string in \fIdest\fP is always null-terminated.
 .PP
 If \fIsrc\fP contains \fIn\fP or more characters,
 .BR strncat ()
diff --git a/man3/strcpy.3 b/man3/strcpy.3
index 9d47e37..8adc2e9 100644
--- a/man3/strcpy.3
+++ b/man3/strcpy.3
@@ -57,7 +57,7 @@ function is similar, except that at most
 .BR Warning :
 If there is no null byte
 among the first \fIn\fP bytes of \fIsrc\fP,
-the string placed in \fIdest\fP will not be null terminated.
+the string placed in \fIdest\fP will not be null-terminated.
 .PP
 If the length of
 .I src
diff --git a/man4/console_ioctl.4 b/man4/console_ioctl.4
index 57c2c0b..7808af3 100644
--- a/man4/console_ioctl.4
+++ b/man4/console_ioctl.4
@@ -325,7 +325,7 @@ struct kbsentry {
 .fi
 .in
 
-\fIkb_string\fP is set to the (NULL terminated) string corresponding to
+\fIkb_string\fP is set to the (null-terminated) string corresponding to
 the \fIkb_func\fPth function key action code.
 .IP \fBKDSKBSENT\fP
 Sets one function key string entry.
-- 
1.6.6.102.gd6f8f

--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 9/9] "null terminated" -> "null-terminated"

[Michael Kerrisk]

Hi Michael

On Sun, Jan 10, 2010 at 12:45 PM, Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> The preferred spelling seems to be "null-terminated".

It's "NULL-terminated" when talking of pointers (e.g., the NULL at the
end of an array of pointers), but "null-terminated" when talking of
the '\0' at the end of a string. Most of existing uses are correct,
but I fixed fts.3 to follow these rules.

Thanks!

Michael

>  fts.3           : "NULL-" -> "null-"
>  getnetent.3     : "NULL-" -> "null-"
>  getprotoent.3   : "NULL-" -> "null-"
>  getrpcent.3     : "NULL-" -> "null-"
>  getservent.3    : "NULL-" -> "null-"
>  getsubopt.3     : "NULL-" -> "null-"
>  putgrent.3      : "NULL " -> "null-"
>  strcat.3        : "null " -> "null-"
>  strcpy.3        : "null " -> "null-"
>  console_ioctl.4 : "NULL " -> "null-"
>
> Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  man3/fts.3           |    8 ++++----
>  man3/getnetent.3     |    2 +-
>  man3/getprotoent.3   |    2 +-
>  man3/getrpcent.3     |    2 +-
>  man3/getservent.3    |    2 +-
>  man3/getsubopt.3     |    2 +-
>  man3/putgrent.3      |    2 +-
>  man3/strcat.3        |    4 ++--
>  man3/strcpy.3        |    2 +-
>  man4/console_ioctl.4 |    2 +-
>  10 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/man3/fts.3 b/man3/fts.3
> index 7927544..e7fc193 100644
> --- a/man3/fts.3
> +++ b/man3/fts.3
> @@ -309,7 +309,7 @@ Upon return from the
>  .BR fts_children ()
>  function, the
>  .I fts_link
> -field points to the next structure in the NULL-terminated linked list of
> +field points to the next structure in the null-terminated linked list of
>  directory members.
>  Otherwise, the contents of the
>  .I fts_link
> @@ -344,7 +344,7 @@ Therefore, the
>  and
>  .I fts_accpath
>  fields are guaranteed to be
> -NULL-terminated
> +null-terminated
>  .I only
>  for the file most recently returned by
>  .BR fts_read ().
> @@ -362,7 +362,7 @@ are attempted.
>  The
>  .I fts_name
>  field is always
> -NULL-terminated.
> +null-terminated.
>  .SS fts_open()
>  The
>  .BR fts_open ()
> @@ -572,7 +572,7 @@ The
>  .BR fts_children ()
>  function returns a pointer to an
>  .I FTSENT
> -structure describing the first entry in a NULL-terminated linked list of
> +structure describing the first entry in a null-terminated linked list of
>  the files in the directory represented by the
>  .I FTSENT
>  structure most recently returned by
> diff --git a/man3/getnetent.3 b/man3/getnetent.3
> index 72b3efa..a6dbfa6 100644
> --- a/man3/getnetent.3
> +++ b/man3/getnetent.3
> @@ -100,7 +100,7 @@ The members of the \fInetent\fP structure are:
>  The official name of the network.
>  .TP
>  .I n_aliases
> -A NULL-terminated list of alternative names for the network.
> +A null-terminated list of alternative names for the network.
>  .TP
>  .I n_addrtype
>  The type of the network number; always
> diff --git a/man3/getprotoent.3 b/man3/getprotoent.3
> index 05c1d7c..2492983 100644
> --- a/man3/getprotoent.3
> +++ b/man3/getprotoent.3
> @@ -98,7 +98,7 @@ The members of the \fIprotoent\fP structure are:
>  The official name of the protocol.
>  .TP
>  .I p_aliases
> -A NULL-terminated list of alternative names for the protocol.
> +A null-terminated list of alternative names for the protocol.
>  .TP
>  .I p_proto
>  The protocol number.
> diff --git a/man3/getrpcent.3 b/man3/getrpcent.3
> index 8135c16..ee56f04 100644
> --- a/man3/getrpcent.3
> +++ b/man3/getrpcent.3
> @@ -46,7 +46,7 @@ The members of this structure are:
>  The name of the server for this RPC program.
>  .TP
>  .I r_aliases
> -A NULL-terminated list of alternate names for the RPC program.
> +A null-terminated list of alternate names for the RPC program.
>  .TP
>  .I r_number
>  The RPC program number for this service.
> diff --git a/man3/getservent.3 b/man3/getservent.3
> index 27df7af..b073ad7 100644
> --- a/man3/getservent.3
> +++ b/man3/getservent.3
> @@ -106,7 +106,7 @@ The members of the \fIservent\fP structure are:
>  The official name of the service.
>  .TP
>  .I s_aliases
> -A NULL-terminated list of alternative names for the service.
> +A null-terminated list of alternative names for the service.
>  .TP
>  .I s_port
>  The port number for the service given in network byte order.
> diff --git a/man3/getsubopt.3 b/man3/getsubopt.3
> index e4ffd59..49dff25 100644
> --- a/man3/getsubopt.3
> +++ b/man3/getsubopt.3
> @@ -51,7 +51,7 @@ that might be passed in
>
>  The
>  .I tokens
> -argument is a pointer to a NULL-terminated list of the tokens that
> +argument is a pointer to a null-terminated list of the tokens that
>  .BR getsubopt ()
>  will look for in
>  .IR optionp .
> diff --git a/man3/putgrent.3 b/man3/putgrent.3
> index 522716b..a33e3df 100644
> --- a/man3/putgrent.3
> +++ b/man3/putgrent.3
> @@ -18,7 +18,7 @@ function is the counterpart for
>  The function writes the content of the provided \fIstruct group\fP into the
>  file pointed to by
>  .IR fp .
> -The list of group members must be NULL terminated or NULL initialized.
> +The list of group members must be null-terminated or null-initialized.
>  .sp
>  The \fIstruct group\fP is defined as follows:
>  .sp
> diff --git a/man3/strcat.3 b/man3/strcat.3
> index eed90ea..26f8025 100644
> --- a/man3/strcat.3
> +++ b/man3/strcat.3
> @@ -53,12 +53,12 @@ function is similar, except that
>  .IP * 3
>  it will use at most \fIn\fP characters from \fIsrc\fP; and
>  .IP *
> -\fIsrc\fP does not need to be null terminated if it contains
> +\fIsrc\fP does not need to be null-terminated if it contains
>  \fIn\fP or more characters.
>  .PP
>  As with
>  .BR strcat (),
> -the resulting string in \fIdest\fP is always null terminated.
> +the resulting string in \fIdest\fP is always null-terminated.
>  .PP
>  If \fIsrc\fP contains \fIn\fP or more characters,
>  .BR strncat ()
> diff --git a/man3/strcpy.3 b/man3/strcpy.3
> index 9d47e37..8adc2e9 100644
> --- a/man3/strcpy.3
> +++ b/man3/strcpy.3
> @@ -57,7 +57,7 @@ function is similar, except that at most
>  .BR Warning :
>  If there is no null byte
>  among the first \fIn\fP bytes of \fIsrc\fP,
> -the string placed in \fIdest\fP will not be null terminated.
> +the string placed in \fIdest\fP will not be null-terminated.
>  .PP
>  If the length of
>  .I src
> diff --git a/man4/console_ioctl.4 b/man4/console_ioctl.4
> index 57c2c0b..7808af3 100644
> --- a/man4/console_ioctl.4
> +++ b/man4/console_ioctl.4
> @@ -325,7 +325,7 @@ struct kbsentry {
>  .fi
>  .in
>
> -\fIkb_string\fP is set to the (NULL terminated) string corresponding to
> +\fIkb_string\fP is set to the (null-terminated) string corresponding to
>  the \fIkb_func\fPth function key action code.
>  .IP \fBKDSKBSENT\fP
>  Sets one function key string entry.
> --
> 1.6.6.102.gd6f8f
>
>



-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Author of "The Linux Programming Interface" http://blog.man7.org/
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [OVERVIEW 0/9] Cleanup Time

[Michael Kerrisk]

Hi Michael,

On Sun, Jan 10, 2010 at 12:45 PM, Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> This patch series is a medley of cleanups
> focused mainly on issues related to time.

Thanks for the very nicely broken down patch set. All patches
processed now, I think.

Cheers,

Michael


> Subjects:
>
>    [PATCH 1/9] tzset.3: Cleanup grammar/clarity
>    [PATCH 2/9] stime.2, strftime.3, tzset.3, zic.8: GMT -> UTC (where appropriate)
>    [PATCH 3/9] strftime.3: Clarification of %z
>    [PATCH 4/9] strftime.3: %z is defined by the SUSv3
>    [PATCH 5/9] strftime.3: Move 822-compliant date format example to EXAMPLES section
>    [PATCH 6/9] strftime.3: Expanded introduction
>    [PATCH 7/9] "timezone" -> "time zone"
>    [PATCH 8/9] Consistently define the Epoch
>    [PATCH 9/9] "null terminated" -> "null-terminated"
>
> Overall diffstat
>
>    man2/gettimeofday.2  |    4 +-
>    man2/stime.2         |    4 +-
>    man2/time.2          |    4 +-
>    man2/utimensat.2     |    6 ++--
>    man3/ctime.3         |   13 +++++------
>    man3/difftime.3      |    6 ++--
>    man3/ftime.3         |    6 ++--
>    man3/fts.3           |    8 +++---
>    man3/getdate.3       |    2 +-
>    man3/getnetent.3     |    2 +-
>    man3/getprotoent.3   |    2 +-
>    man3/getrpcent.3     |    2 +-
>    man3/getservent.3    |    2 +-
>    man3/getspnam.3      |    4 +-
>    man3/getsubopt.3     |    2 +-
>    man3/mq_receive.3    |    2 +-
>    man3/mq_send.3       |    2 +-
>    man3/putgrent.3      |    2 +-
>    man3/rtime.3         |    4 +-
>    man3/sem_wait.3      |    2 +-
>    man3/strcat.3        |    4 +-
>    man3/strcpy.3        |    2 +-
>    man3/strftime.3      |   58 +++++++++++++++++++++++++++++++++----------------
>    man3/strptime.3      |    7 ++---
>    man3/sysconf.3       |    2 +-
>    man3/timeradd.3      |    3 +-
>    man3/tzset.3         |   44 +++++++++++++++++++-------------------
>    man4/console_ioctl.4 |    2 +-
>    man4/rtc.4           |    2 +-
>    man5/core.5          |    2 +-
>    man5/proc.5          |    2 +-
>    man5/tzfile.5        |   18 +++++++-------
>    man7/environ.7       |    2 +-
>    man7/hier.7          |    2 +-
>    man7/icmp.7          |    2 +-
>    man7/time.7          |    2 +-
>    man8/tzselect.8      |   10 ++++----
>    man8/zdump.8         |    2 +-
>    man8/zic.8           |   30 +++++++++++++-------------
>    39 files changed, 146 insertions(+), 129 deletions(-)
>
> Sincerely,
> Michael Witten
>



-- 
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Author of "The Linux Programming Interface" http://blog.man7.org/
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [OVERVIEW 0/9] Cleanup Time

[Michael Witten]

On Sat, Jan 16, 2010 at 11:35 PM, Michael Kerrisk
<mtk.manpages-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> wrote:
> On Sun, Jan 10, 2010 at 12:45 PM, Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>> This patch series is a medley of cleanups
>> focused mainly on issues related to time.
>
> Thanks for the very nicely broken down patch set. All patches
> processed now, I think.

Thank *you*!

This was fun; I hope I can contribute more in the future.
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/9] tzset.3: Cleanup grammar/clarity

[Michael Witten]

* A comma is added at the end of an introductory phrase.

* The preposition `to' is used to complete the idea of
  setting a variable's value.

* The conjunction `or' is introduced to separate alternative
  values for `daylight'.

Signed-off-by: Michael Witten <mfwitten-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 man3/tzset.3 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man3/tzset.3 b/man3/tzset.3
index 10c6d3a..ad496f7 100644
--- a/man3/tzset.3
+++ b/man3/tzset.3
@@ -66,9 +66,9 @@ function initializes the \fItzname\fP variable from the
 environment variable.
 This function is automatically called by the
 other time conversion functions that depend on the timezone.
-In a System-V-like environment it will also set the variables \fItimezone\fP
-(seconds West of GMT) and \fIdaylight\fP (0 if this timezone does not
-have any daylight saving time rules, non-zero if there is a time during
+In a System-V-like environment, it will also set the variables \fItimezone\fP
+(to seconds West of GMT) and \fIdaylight\fP (to 0 if this timezone does not
+have any daylight saving time rules, or to non-zero if there is a time during
 the year when daylight saving time applies).
 .PP
 If the
-- 
1.6.5.2.180.gc5b3e

--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html