Mercurial > emacs
changeset 98811:e51cb1bd0e3a
(Time Parsing, Processor Run Time): Fix last change.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 18 Oct 2008 09:40:45 +0000 |
parents | 09f1342109b9 |
children | 38749a93f5a4 |
files | doc/lispref/os.texi |
diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/lispref/os.texi Sat Oct 18 08:11:30 2008 +0000 +++ b/doc/lispref/os.texi Sat Oct 18 09:40:45 2008 +0000 @@ -1340,19 +1340,19 @@ @table @samp @item %y @itemx %Y -The number of full 365-day years. +The integer number of 365-day years. @item %d @itemx %D -The number of full days. +The integer number of days. @item %h @itemx %H -The number of full hours. +The integer number of hours. @item %m @itemx %M -The number of full minutes. +The integer number of minutes. @item %s @itemx %S -The number of seconds. +The integer number of seconds. @item %z Non-printing control flag. When it is used, other specifiers must be given in the order of decreasing size, i.e.@: years before days, hours @@ -1391,10 +1391,10 @@ @defun emacs-uptime &optional format This function returns a string representing the Emacs @dfn{uptime}---the elapsed wall-clock time this instance of Emacs is -running. The string is formatted according to the optional argument -@var{format}. For the available format descriptors, see @ref{Time -Parsing, format-seconds}. If @var{format} is nil or omitted, it -defaults to @code{"%Y, %D, %H, %M, %z%S"}. +running. The string is formatted by @code{format-seconds} according +to the optional argument @var{format}. For the available format +descriptors, see @ref{Time Parsing, format-seconds}. If @var{format} +is nil or omitted, it defaults to @code{"%Y, %D, %H, %M, %z%S"}. @end defun @defun get-internal-run-time