diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-31 09:19:21 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-31 09:19:21 (GMT) |
commit | 85d70230296a50fa8805dca4b6a7281746759c7a (patch) | |
tree | 59e94c5c206dc93a5e6ba9c3fd901a94e9bf52fd /doc/clock.n | |
parent | cef09a18ae9b1a55404db45ade312b06880c0f65 (diff) | |
parent | 91189c426903448dfa31ba4983c5d3035cb351a5 (diff) | |
download | tcl-85d70230296a50fa8805dca4b6a7281746759c7a.zip tcl-85d70230296a50fa8805dca4b6a7281746759c7a.tar.gz tcl-85d70230296a50fa8805dca4b6a7281746759c7a.tar.bz2 |
merge core-8-6-branch (except: the "timerate" command and the clock performance-tests are kept)
Diffstat (limited to 'doc/clock.n')
-rw-r--r-- | doc/clock.n | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/clock.n b/doc/clock.n index 5d00aeb..dbe00ba 100644 --- a/doc/clock.n +++ b/doc/clock.n @@ -539,7 +539,7 @@ Common Era. \fB%Es\fR This affects similar to \fB%s\fR, but in opposition to \fB%s\fR it parses or formats local seconds (not the posix seconds). -Because \fB%s\fR has the same precedence as \fB%s\fR (uniquely determines +Because \fB%s\fR has the same precedence as \fB%s\fR (uniquely determines a point in time), it overrides all other input formats. .TP \fB%Ex\fR @@ -736,7 +736,7 @@ week number \fB%V\fR; programs should use \fB%G\fR for that purpose. On output, produces the current time zone, expressed in hours and minutes east (+hhmm) or west (\-hhmm) of Greenwich. On input, accepts a time zone specifier (see \fBTIME ZONES\fR below) that will be used to -determine the time zone (this token is optionally applicable on input, +determine the time zone (this token is optionally applicable on input, so the value is not mandatory and can be missing in input). .TP \fB%Z\fR @@ -951,7 +951,7 @@ precision of type of the token. In example below the second date-string contains "next January", therefore it results in next year but in January. And third date-string besides "January" contains also additionally "Fri", so it results in the nearest Friday. -Thus both win before "385 days" resp. make it more precise, because of higher +Thus both win before "385 days" resp. make it more precise, because of higher precision of this token types. .CS % clock format [clock scan "5 years 18 months 385 days" -base 0 -gmt 1] -gmt 1 |