master c34a425d4de 2/2: Correct temperature names in Calc

[Mattias Engdegård]

branch: master
commit c34a425d4dec9210284b5140a018d71950cac1bd
Author: Mattias Engdegård <mattiase@acm.org>
Commit: Mattias Engdegård <mattiase@acm.org>

    Correct temperature names in Calc
    
    * doc/misc/calc.texi (The Units Table, Predefined Units):
    * lisp/calc/calc-units.el (math-standard-units):
    It's just Kelvin, not degree Kelvin.
---
 doc/misc/calc.texi      | 6 +++---
 lisp/calc/calc-units.el | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 5064f76e7b8..ec32c72cb7b 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -28032,7 +28032,7 @@ unit name on the stack and then reduce it to base units 
with @kbd{u b}.
 The @kbd{u e} (@code{calc-explain-units}) command displays an English
 description of the units of the expression on the stack.  For example,
 for the expression @samp{62 km^2 g / s^2 mol K}, the description is
-``Square-Kilometer Gram per (Second-squared Mole Degree-Kelvin).''  This
+``Square-Kilometer Gram per (Second-squared Mole Kelvin).''  This
 command uses the English descriptions that appear in the righthand
 column of the Units Table.
 
@@ -28066,8 +28066,8 @@ Canadian (@code{galC}), and British (@code{galUK}) 
definitions.  Also,
 note that @code{oz} is a standard ounce of mass, @code{ozt} is a Troy
 ounce, and @code{ozfl} is a fluid ounce.
 
-The temperature units corresponding to degrees Kelvin and Centigrade
-(Celsius) are the same in this table, since most units commands treat
+The temperature units corresponding to Kelvin and degree Celsius
+are the same in this table, since most units commands treat
 temperatures as being relative.  The @code{calc-convert-temperature}
 command has special rules for handling the different absolute magnitudes
 of the various temperature scales.
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index c2f692007d5..480b0bd818d 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -181,9 +181,7 @@
     ( hpm     "75 m kgf/s"           "Metric Horsepower") ;;ESUWM
 
     ;; Temperature
-    ( K       nil                    "*Degree Kelvin"     K )
-    ( dK      "K"                    "Degree Kelvin"      K )
-    ( degK    "K"                    "Degree Kelvin"      K )
+    ( K       nil                    "*Kelvin"            K )
     ( dC      "K"                    "Degree Celsius"     C )
     ( degC    "K"                    "Degree Celsius"     C )
     ( dF      "(5/9) K"              "Degree Fahrenheit"  F )