Merge from origin/emacs-25

ca50981 Improve time zone documentation
c23c965 Prevent bootstrap autoload backup files
9344612 Disable multicolor fonts on OS X since they are not supported...
c41ce1c Capitalize “Universal Time” in documentation
10597c9 Don't use 'find-program'

1 files changed, 9 insertions, 9 deletions

diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index bf8bedd599e..6fec8055319 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -173,7 +173,7 @@ delta.  At present, delta = 0.01 degrees, so the value of the variable
 ;;; End of user options.
 
 (defvar solar-sidereal-time-greenwich-midnight nil
-  "Sidereal time at Greenwich at midnight (universal time).")
+  "Sidereal time at Greenwich at midnight (Universal Time).")
 
 (defvar solar-northern-spring-or-summer-season nil
   "Non-nil if northern spring or summer and nil otherwise.
@@ -413,8 +413,8 @@ Result is in days.  For the years 1800-1987, the maximum error is
 (defun solar-ephemeris-time (time)
   "Ephemeris Time at moment TIME.
 TIME is a pair with the first component being the number of Julian centuries
-elapsed at 0 Universal Time, and the second component being the universal
-time.  For instance, the pair corresponding to November 28, 1995 at 16 UT is
+elapsed at 0 Universal Time, and the second component counting Universal Time
+hours.  For instance, the pair corresponding to November 28, 1995 at 16 UT is
 \(-0.040945 16), -0.040945 being the number of Julian centuries elapsed between
 Jan 1, 2000 at 12 UT and November 28, 1995 at 0 UT.
 
@@ -430,7 +430,7 @@ Result is in Julian centuries of ephemeris time."
   "Right ascension (in hours) and declination (in degrees) of the sun at TIME.
 TIME is a pair with the first component being the number of
 Julian centuries elapsed at 0 Universal Time, and the second
-component being the universal time.  For instance, the pair
+component counting Universal Time hours.  For instance, the pair
 corresponding to November 28, 1995 at 16 UT is (-0.040945 16),
 -0.040945 being the number of Julian centuries elapsed between
 Jan 1, 2000 at 12 UT and November 28, 1995 at 0 UT.  SUNRISE-FLAG is passed
@@ -444,7 +444,7 @@ to `solar-ecliptic-coordinates'."
   "Azimuth and height of the sun at TIME, LATITUDE, and LONGITUDE.
 TIME is a pair with the first component being the number of
 Julian centuries elapsed at 0 Universal Time, and the second
-component being the universal time.  For instance, the pair
+component counting Universal Time hours.  For instance, the pair
 corresponding to November 28, 1995 at 16 UT is (-0.040945 16),
 -0.040945 being the number of Julian centuries elapsed between
 Jan 1, 2000 at 12 UT and November 28, 1995 at 0 UT.  SUNRISE-FLAG
@@ -476,8 +476,8 @@ Sunrise if DIRECTION =-1 or sunset if =1 at LATITUDE, LONGITUDE, with midday
 being TIME.
 
 TIME is a pair with the first component being the number of Julian centuries
-elapsed at 0 Universal Time, and the second component being the universal
-time.  For instance, the pair corresponding to November 28, 1995 at 16 UT is
+elapsed at 0 Universal Time, and the second component counting Universal Time
+hours.  For instance, the pair corresponding to November 28, 1995 at 16 UT is
 \(-0.040945 16), -0.040945 being the number of Julian centuries elapsed between
 Jan 1, 2000 at 12 UT and November 28, 1995 at 0 UT.
 
@@ -522,8 +522,8 @@ Uses binary search."
 Parameters are the midday TIME and the LATITUDE, LONGITUDE of the location.
 
 TIME is a pair with the first component being the number of Julian centuries
-elapsed at 0 Universal Time, and the second component being the universal
-time.  For instance, the pair corresponding to November 28, 1995 at 16 UT is
+elapsed at 0 Universal Time, and the second component counting Universal Time
+hours.  For instance, the pair corresponding to November 28, 1995 at 16 UT is
 \(-0.040945 16), -0.040945 being the number of Julian centuries elapsed between
 Jan 1, 2000 at 12 UT and November 28, 1995 at 0 UT.