[Emacs-diffs] emacs-25 c4963f9: Fix doc for Universal Time

[Paul Eggert]

branch: emacs-25
commit c4963f9a905bf15740aa7e3ebf85af917f17be15
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Fix doc for Universal Time
    
    * doc/lispref/os.texi (Time of Day, Time Conversion):
    Be more careful about distinguishing UTC (which is not valid for
    pre-1961 time stamps) and UT (which is).
    (Time Parsing): Remove stray obsolete paragraph about a
    UNIVERSAL argument for ‘format-time-string’.
---
 doc/lispref/os.texi |   14 +++++---------
 etc/NEWS            |    4 ++--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index c5e3672..8839745 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -1305,7 +1305,7 @@ This function returns a list describing the time zone 
that the user is
 in.
 
 The value has the form @code{(@var{offset} @var{name})}.  Here
address@hidden is an integer giving the number of seconds ahead of UTC
address@hidden is an integer giving the number of seconds ahead of Universal 
Time
 (east of Greenwich).  A negative value means west of Greenwich.  The
 second element, @var{name}, is a string giving the name of the time
 zone.  Both elements change when daylight saving time begins or ends;
@@ -1323,7 +1323,7 @@ defaults to the current time zone rule.
 @vindex TZ, environment variable
 The default time zone is determined by the @env{TZ} environment
 variable.  @xref{System Environment}.  For example, you can tell Emacs
-to default to universal time with @code{(setenv "TZ" "UTC0")}.  If
+to default to Universal Time with @code{(setenv "TZ" "UTC0")}.  If
 @env{TZ} is not in the environment, Emacs uses system wall clock time,
 which is a platform-dependent default time zone.
 
@@ -1347,8 +1347,8 @@ calendrical information and vice versa.
 
   Many 32-bit operating systems are limited to system times containing
 32 bits of information in their seconds component; these systems
-typically handle only the times from 1901-12-13 20:45:52 UTC through
-2038-01-19 03:14:07 address@hidden  However, 64-bit and some 32-bit operating
+typically handle only the times from 1901-12-13 20:45:52 through
+2038-01-19 03:14:07 Universal Time.  However, 64-bit and some 32-bit operating
 systems have larger seconds components, and can represent times far in
 the past or future.
 
@@ -1390,7 +1390,7 @@ Sunday.
 @item dst
 @code{t} if daylight saving time is effect, otherwise @code{nil}.
 @item utcoff
-An integer indicating the UTC offset in seconds, i.e., the number of
+An integer indicating the Universal Time offset in seconds, i.e., the number of
 seconds east of Greenwich.
 @end table
 
@@ -1559,10 +1559,6 @@ based on the Japanese Emperors' reigns.  @samp{E} is 
allowed in
 representation of numbers, instead of the ordinary decimal digits.  This
 is allowed with most letters, all the ones that output numbers.
 
-If @var{universal} is address@hidden, that means to describe the time as
-Universal Time; @code{nil} means describe it using what Emacs believes
-is the local time zone (see @code{current-time-zone}).
-
 This function uses the C library function @code{strftime}
 (@pxref{Formatting Calendar Time,,, libc, The GNU C Library Reference
 Manual}) to do most of the work.  In order to communicate with that
diff --git a/etc/NEWS b/etc/NEWS
index 7de746e..9526588 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1772,8 +1772,8 @@ function 'encode-time', which already accepted a simple 
time zone rule
 argument, has been extended to accept all the new forms.
 
 *** Incompatible change in the third argument of 'format-time-string'.
-Previously, any non-nil argument was interpreted as a UTC time zone.
-This is no longer true; packages that want UTC time zone should pass t
+Previously, any non-nil argument was interpeted as specifying Universal Time.
+This is no longer true; packages that want Universal Time should pass t
 as the third argument.
 
 *** Time-related functions now consistently accept numbers