diff options
| -rw-r--r-- | Changes | 5 | ||||
| -rw-r--r-- | man2/gettimeofday.2 | 2 | ||||
| -rw-r--r-- | man3/ctime.3 | 8 | ||||
| -rw-r--r-- | man3/ftime.3 | 2 | ||||
| -rw-r--r-- | man3/getdate.3 | 2 | ||||
| -rw-r--r-- | man3/strftime.3 | 2 | ||||
| -rw-r--r-- | man3/strptime.3 | 2 | ||||
| -rw-r--r-- | man3/tzset.3 | 28 | ||||
| -rw-r--r-- | man5/tzfile.5 | 18 | ||||
| -rw-r--r-- | man7/environ.7 | 2 | ||||
| -rw-r--r-- | man8/tzselect.8 | 10 | ||||
| -rw-r--r-- | man8/zdump.8 | 2 | ||||
| -rw-r--r-- | man8/zic.8 | 22 |
13 files changed, 55 insertions, 50 deletions
@@ -48,6 +48,11 @@ New and changed links Global changes -------------- +Various pages + mtk + s/time zone/timezone/ for consistency across pages and + with POSIX.1. + kill.2 sigaction.2 sigpending.2 diff --git a/man2/gettimeofday.2 b/man2/gettimeofday.2 index 601073003..4773dcbc1 100644 --- a/man2/gettimeofday.2 +++ b/man2/gettimeofday.2 @@ -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 time zones +So this method of representing timezones has been abandoned. Under Linux, in a call to .BR settimeofday () diff --git a/man3/ctime.3 b/man3/ctime.3 index 3bfdc61a1..46c786d59 100644 --- a/man3/ctime.3 +++ b/man3/ctime.3 @@ -163,7 +163,7 @@ might be overwritten by subsequent calls to any of the date and time functions. The function also sets the external variable \fItzname\fP (see .BR tzset (3)) -with information about the current time zone. +with information about the current timezone. The reentrant version .BR ctime_r () does the same, but stores the @@ -188,11 +188,11 @@ The .BR localtime () function converts the calendar time \fItimep\fP to broken-time representation, expressed relative to the user's specified -time zone. +timezone. The function acts as if it called .BR tzset (3) and sets the external variables \fItzname\fP with -information about the current time zone, \fItimezone\fP with the difference +information about the current timezone, \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. @@ -229,7 +229,7 @@ normalized (so that, for example, 40 October is changed into 9 November). Calling .BR mktime () also sets the external variable \fItzname\fP with -information about the current time zone. +information about the current timezone. If the specified broken-down time cannot be represented as calendar time (seconds since the Epoch), .BR mktime () diff --git a/man3/ftime.3 b/man3/ftime.3 index 5c4aeff7f..a79938237 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 time zone measured in minutes +The \fItimezone\fP field is the local timezone 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 6b76ee752..962ed0eaa 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 time zone. +time in the given timezone. 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 1dfbc21e6..01b4e3936 100644 --- a/man3/strftime.3 +++ b/man3/strftime.3 @@ -247,7 +247,7 @@ Required to emit RFC\ 822-conformant dates (using "%a,\ %d\ %b\ %Y\ %H:%M:%S\ %z"). (GNU) .TP .B %Z -The time zone or name or abbreviation. +The timezone or name or abbreviation. .TP .B %+ .\" Nov 05 -- Not in Linux/glibc, but is in some BSDs (according to diff --git a/man3/strptime.3 b/man3/strptime.3 index 415b12c90..99897f177 100644 --- a/man3/strptime.3 +++ b/man3/strptime.3 @@ -352,7 +352,7 @@ 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 time zone specification. +An RFC-822/ISO 8601 standard timezone specification. .TP .B %Z The timezone name. diff --git a/man3/tzset.3 b/man3/tzset.3 index b47cc1b85..c8ad521e8 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 time zone. +other time conversion functions that depend on the timezone. In a SysV-like environment it will also set the variables \fItimezone\fP -(seconds West of GMT) and \fIdaylight\fP (0 if this time zone does not +(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 the year when daylight saving time applies). .PP @@ -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 time zone: +when there is no daylight saving time in the local timezone: .sp .RS .I std offset .RE .sp -The \fIstd\fP string specifies the name of the time zone and must be +The \fIstd\fP string specifies the name of the timezone 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 time zone is west of the Prime Meridian and negative if it is +if the local timezone 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 time zone, as described above. +\fIoffset\fP specify the standard timezone, as described above. The \fIdst\fP string and \fIoffset\fP specify the name and offset for the -corresponding daylight saving time zone. +corresponding daylight saving timezone. If the offset is omitted, it default to one hour ahead of standard time. .PP @@ -159,14 +159,14 @@ 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 time zone information should be read +The third format specifies that the timezone information should be read from a file: .sp .RS :[filespec] .RE .sp -If the file specification \fIfilespec\fP is omitted, the time zone +If the file specification \fIfilespec\fP is omitted, the timezone information is read from the file .I localtime in the system timezone directory, which nowadays usually is @@ -176,7 +176,7 @@ This file is in format. If \fIfilespec\fP is given, it specifies another .BR tzfile (5)-format -file to read the time zone information from. +file to read the timezone information from. If \fIfilespec\fP does not begin with a \(aq/\(aq, the file specification is relative to the system timezone directory. .PP @@ -186,7 +186,7 @@ Here's an example, once more for New Zealand: TZ=":Pacific/Auckland" .fi .SH FILES -The system time zone directory used depends on the (g)libc version. +The system timezone directory used depends on the (g)libc version. Libc4 and libc5 use .IR /usr/lib/zoneinfo , and, since libc-5.4.6, @@ -200,7 +200,7 @@ Its default depends on how it was installed, but normally is .LP This timezone directory contains the files .nf -localtime local time zone file +localtime local timezone 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 time zone file in the system time zone directory. +or to the correct timezone file in the system timezone 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 time zone corresponding to its first argument (minutes +name of the timezone corresponding to its first argument (minutes West of GMT). 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 6ec7561d2..1e41c7e22 100644 --- a/man5/tzfile.5 +++ b/man5/tzfile.5 @@ -3,14 +3,14 @@ .\" 1996-06-05 by Arthur David Olson <arthur_david_olson@nih.gov>. .TH TZFILE 5 1996-06-05 "" "Linux Programmer's Manual" .SH NAME -tzfile \- time zone information +tzfile \- timezone information .SH SYNOPSIS .B #include <tzfile.h> .SH DESCRIPTION -The time zone information files used by +The timezone information files used by .BR tzset (3) begin with the magic characters "TZif" to identify then as -time zone information files, +timezone 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 "time zone abbreviation strings" +The number of characters of "timezone 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 time zone abbreviation characters +serves as an index into the array of timezone 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 time zone file is used in handling POSIX-style -time zone environment variables. +and are used when a timezone file is used in handling POSIX-style +timezone 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 time zone file is used in handling POSIX-style -time zone environment variables. +and are used when a timezone file is used in handling POSIX-style +timezone environment variables. .PP .I Localtime uses the first standard-time diff --git a/man7/environ.7 b/man7/environ.7 index 908b4ca1b..f07577adf 100644 --- a/man7/environ.7 +++ b/man7/environ.7 @@ -160,7 +160,7 @@ to be used with .BR gethostbyname (3). .LP .BR TZ " and " TZDIR -give time zone information used by +give timezone information used by .BR tzset (3) and through that by functions like .BR ctime (3), diff --git a/man8/tzselect.8 b/man8/tzselect.8 index c843781c6..717eaee1f 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 time zone +tzselect \- select a timezone .SH SYNOPSIS .B tzselect .SH DESCRIPTION The .B tzselect program asks the user for information about the current location, -and outputs the resulting time zone description to standard output. +and outputs the resulting timezone 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 time zone was successfully obtained +The exit status is zero if a timezone 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 time zone data files (default: +Name of the directory containing timezone 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 time zone \fITZ\fP. +Time zone data file for timezone \fITZ\fP. .SH "SEE ALSO" .BR tzfile (5), .BR zdump (8), diff --git a/man8/zdump.8 b/man8/zdump.8 index f21656914..d9e9d7e97 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 \- time zone dumper +zdump \- timezone dumper .SH SYNOPSIS .B zdump [ diff --git a/man8/zic.8 b/man8/zic.8 index 0431de3f4..949fb62d6 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 \- time zone compiler +zic \- timezone 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 time zone as local time. +Use the given timezone 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 time zone's rules when handling POSIX-format -time zone environment variables. +Use the given timezone's rules when handling POSIX-format +timezone 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 time zone abbreviations to be used when this rule is in effect. +of timezone 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'GMTOFF'u" .B NAME -The name of the time zone. +The name of the timezone. 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 time zone or, +The name of the rule(s) that apply in the timezone or, alternately, an amount of time to add to local standard time. If this field is .B \- -then standard time always applies in the time zone. +then standard time always applies in the timezone. .TP .B FORMAT -The format for time zone abbreviations in this time zone. +The format for timezone abbreviations in this timezone. The pair of characters .B %s is used to show where the .q "variable part" -of the time zone abbreviation goes. +of the timezone 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 time zone information is generated from the given UTC offset +the timezone 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 |