[Emacs-diffs] trunk r115132: Minor doc fixes.

[Xue Fuqiao]

------------------------------------------------------------
revno: 115132
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Mon 2013-11-18 06:30:44 +0800
message:
  Minor doc fixes.
  
  * doc/lispref/os.texi (Time Parsing):
  (Processor Run Time, Input Modes, Terminal Output): Minor fixes.
modified:
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/os.texi            os.texi-20091113204419-o5vbwnq5f7feedwu-6205

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-11-14 08:38:50 +0000
+++ b/doc/lispref/ChangeLog     2013-11-17 22:30:44 +0000
@@ -1,3 +1,8 @@
+2013-11-17  Xue Fuqiao  <address@hidden>
+
+       * os.texi (Time Parsing):
+       (Processor Run Time, Input Modes, Terminal Output): Minor fixes.
+
 2013-11-14  Glenn Morris  <address@hidden>
 
        * loading.texi (Library Search): Update section.

=== modified file 'doc/lispref/os.texi'
--- a/doc/lispref/os.texi       2013-11-11 22:52:08 +0000
+++ b/doc/lispref/os.texi       2013-11-17 22:30:44 +0000
@@ -1524,7 +1524,7 @@
 @defun seconds-to-time seconds
 This function converts @var{seconds}, a floating point number of
 seconds since the epoch, to a time value and returns that.  To perform
-the inverse conversion, use @code{float-time}.
+the inverse conversion, use @code{float-time} (@pxref{Time of Day}).
 @end defun
 
 @defun format-seconds format-string seconds
@@ -1586,6 +1586,7 @@
 both elapsed and processor time, used by the Emacs process.
 
 @deffn Command emacs-uptime &optional format
address@hidden uptime of Emacs
 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 by @code{format-seconds} according
@@ -1922,10 +1923,10 @@
 
 @defun set-input-mode interrupt flow meta &optional quit-char
 This function sets the mode for reading keyboard input.  If
address@hidden is non-null, then Emacs uses input interrupts.  If it is
address@hidden, then it uses @sc{cbreak} mode.  The default setting is
-system-dependent.  Some systems always use @sc{cbreak} mode regardless
-of what is specified.
address@hidden is address@hidden, then Emacs uses input interrupts.
+If it is @code{nil}, then it uses @sc{cbreak} mode.  The default
+setting is system-dependent.  Some systems always use @sc{cbreak} mode
+regardless of what is specified.
 
 When Emacs communicates directly with X, it ignores this argument and
 uses interrupts if that is the way it knows how to communicate.
@@ -2075,17 +2076,17 @@
 were actually output, you can determine reliably whether they correspond
 to the Termcap specifications in use.
 
address@hidden
address@hidden
+(open-termscript "../junk/termscript")
+     @result{} nil
address@hidden group
address@hidden example
+
 You close the termscript file by calling this function with an
 argument of @code{nil}.
 
 See also @code{open-dribble-file} in @ref{Recording Input}.
-
address@hidden
address@hidden
-(open-termscript "../junk/termscript")
-     @result{} nil
address@hidden group
address@hidden example
 @end deffn
 
 @node Sound Output
@@ -2096,6 +2097,7 @@
 certain systems are supported; if you call @code{play-sound} on a
 system which cannot really do the job, it gives an error.
 
address@hidden FIXME: Add indexes for Au and WAV?  --xfq
   The sound must be stored as a file in RIFF-WAVE format (@samp{.wav})
 or Sun Audio format (@samp{.au}).