[Emacs-diffs] trunk r115065: Doc fixes.

[Xue Fuqiao]

------------------------------------------------------------
revno: 115065
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Tue 2013-11-12 06:52:08 +0800
message:
  Doc fixes.
  
  * doc/lispref/os.texi (User Identification, Time of Day, Time Conversion): 
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-10 12:18:03 +0000
+++ b/doc/lispref/ChangeLog     2013-11-11 22:52:08 +0000
@@ -1,3 +1,8 @@
+2013-11-11  Xue Fuqiao  <address@hidden>
+
+       * os.texi (User Identification, Time of Day, Time Conversion):
+       Minor fixes.
+
 2013-11-10  Jan Djärv  <address@hidden>
 
        * keymaps.texi (Tool Bar): Mention that Gtk+/NS ignores item 1 to 3.

=== modified file 'doc/lispref/os.texi'
--- a/doc/lispref/os.texi       2013-11-09 07:19:16 +0000
+++ b/doc/lispref/os.texi       2013-11-11 22:52:08 +0000
@@ -552,8 +552,8 @@
 In some cases, the option is followed in the command line by an
 argument.  In these cases, the @var{handler-function} can find all the
 remaining command-line arguments in the variable
address@hidden  (The entire list of command-line
-arguments is in @code{command-line-args}.)
address@hidden (see below).  (The entire list of
+command-line arguments is in @code{command-line-args}.)
 
 The command-line arguments are parsed by the @code{command-line-1}
 function in the @file{startup.el} file.  See also @ref{Emacs
@@ -961,6 +961,7 @@
 removes @var{variable} from the environment.  Otherwise, @var{value}
 should be a string.
 
address@hidden FIXME: Document `substitute-env-vars'?  --xfq
 If the optional argument @var{substitute} is address@hidden, Emacs
 calls the function @code{substitute-env-vars} to expand any
 environment variables in @var{value}.
@@ -1097,9 +1098,9 @@
 Lisp packages that load files of customizations, or any other sort of
 user profile, should obey this variable in deciding where to find it.
 They should load the profile of the user name found in this variable.
-If @code{init-file-user} is @code{nil}, meaning that the @samp{-q}
-option was used, then Lisp packages should not load any customization
-files or user profile.
+If @code{init-file-user} is @code{nil}, meaning that the @samp{-q},
address@hidden, or @samp{-batch} option was used, then Lisp packages should
+not load any customization files or user profile.
 @end defvar
 
 @defopt user-mail-address
@@ -1149,6 +1150,7 @@
 variables are also useful for constructing frame titles (@pxref{Frame
 Titles}).
 
address@hidden UID
 @defun user-real-uid
 This function returns the real @acronym{UID} of the user.
 The value may be a floating point number, in the (unlikely) event that
@@ -1160,6 +1162,7 @@
 The value may be a floating point number.
 @end defun
 
address@hidden GID
 @defun group-gid
 This function returns the effective @acronym{GID} of the Emacs process.
 The value may be a floating point number.
@@ -1219,9 +1222,9 @@
 argument to @code{current-time-string}, two-, three-, and four-integer
 lists are accepted.  You can convert times from the list
 representation into standard human-readable strings using
address@hidden, or to other forms using the @code{decode-time}
-and @code{format-time-string} functions documented in the following
-sections.
address@hidden, or to other forms using the
address@hidden and @code{format-time-string} functions documented
+in the following sections.
 
 @defun current-time-string &optional time-value
 This function returns the current time and date as a human-readable
@@ -1265,6 +1268,7 @@
 @end defun
 
 @defun current-time-zone &optional time-value
address@hidden time zone, current
 This function returns a list describing the time zone that the user is
 in.
 
@@ -1291,6 +1295,7 @@
 
 @node Time Conversion
 @section Time Conversion
address@hidden calendrical information
 
   These functions convert time values (lists of two to four integers,
 as explained in the previous section) into calendrical information and