diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-11-20 20:47:55 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-11-20 20:47:55 -0800 |
| commit | 6ef2e5ef5278a807132b78c42de402925b20bfb3 (patch) | |
| tree | e5711cdfcdf8a152416c2a96e399695285a4a3a8 /doc/lispref/os.texi | |
| parent | eadf1faa3cb5eea8c25a5166a9a97ebd63525c56 (diff) | |
| parent | b6729a180f4b81ac26bd7b61f5330643b2d5e994 (diff) | |
| download | emacs-6ef2e5ef5278a807132b78c42de402925b20bfb3.tar.gz | |
Merge from emacs-24; up to 2012-11-17T22:12:47Z!eggert@cs.ucla.edu
Diffstat (limited to 'doc/lispref/os.texi')
| -rw-r--r-- | doc/lispref/os.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 2f06e207fc4..7552aaccc53 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -1373,8 +1373,8 @@ on others, years as early as 1901 do work. @node Time Parsing @section Parsing and Formatting Times - These functions convert time values (lists of two or three integers) -to text in a string, and vice versa. + These functions convert time values to text in a string, and vice versa. +Time values are lists of two to four integers (@pxref{Time of Day}). @defun date-to-time string This function parses the time-string @var{string} and returns the |