merge trunk

[gnu-emacs] / doc / misc / calc.texi

diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 425cd34978493207314b469ebc4d12e2cf7d1392..1700aee9dc154b47e072cc977bc0afb50ab70494 100644 (file)
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -4,6 +4,7 @@
 @setfilename ../../info/calc
 @c [title]
 @settitle GNU Emacs Calc Manual
+@documentencoding UTF-8
 @setchapternewpage odd
 @comment %**end of header (This is for running Texinfo on a region.)
 
@@ -94,7 +95,7 @@ This file documents Calc, the GNU Emacs calculator, included with
 GNU Emacs @value{EMACSVER}.
 @end ifnotinfo
 
-Copyright @copyright{} 1990--1991, 2001--2013 Free Software Foundation, Inc.
+Copyright @copyright{} 1990--1991, 2001--2014 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -140,7 +141,7 @@ modify this GNU manual.''
 @c [begin]
 @ifnottex
 @node Top, Getting Started, (dir), (dir)
-@chapter The GNU Emacs Calculator
+@top The GNU Emacs Calculator
 
 @noindent
 @dfn{Calc} is an advanced desk calculator and mathematical tool
@@ -11801,7 +11802,7 @@ Thus @kbd{M-@key{DEL}} by itself removes the second-from-top stack element,
 leaving the first, third, fourth, and so on; @kbd{M-3 M-@key{DEL}} deletes
 the third stack element.
 
-The above commands do not depend on the location of the cursor.  
+The above commands do not depend on the location of the cursor.
 If the customizable variable @code{calc-context-sensitive-enter} is
 non-@code{nil} (@pxref{Customizing Calc}), these commands will become
 context sensitive.  For example, instead of duplicating the top of the stack,
@@ -28052,8 +28053,8 @@ radiation related to the cesium-133 atom.  The only SI unit that is not
 based on a fundamental physical process (although there are efforts to
 change this) is the kilogram, which was originally defined as the mass
 of one liter of water, but is now defined as the mass of the
-International Prototype Kilogram (IPK), a cylinder of platinum-iridium
-kept at the Bureau International des Poids et Mesures in S@`evres,
+international prototype of the kilogram (IPK), a cylinder of platinum-iridium
+kept at the Bureau international des poids et mesures in S@`evres,
 France.  (There are several copies of the IPK throughout the world.)
 The British imperial units, once defined in terms of physical objects,
 were redefined in 1963 in terms of SI units.  The US customary units,
@@ -33326,7 +33327,7 @@ integers.  Each @var{d} is a base-@expr{10^n} ``digit'' (where again,
 99@dots{}9.  The least significant digit is @var{d0}; the last digit,
 @var{dn}, which is always nonzero, is the most significant digit.  For
 example, the integer @mathit{-12345678} might be stored as
-@samp{(bigneg 678 345 12)}. 
+@samp{(bigneg 678 345 12)}.
 
 The distinction between small and large integers is entirely hidden from
 the user.  In @code{defmath} definitions, the Lisp predicate @code{integerp}
@@ -35712,10 +35713,10 @@ is @code{nil}.
 The commands @code{calc-enter} and @code{calc-pop} will typically
 duplicate the top of the stack.  If
 @code{calc-context-sensitive-enter} is non-@code{nil}, then the
-@code{calc-enter} will copy the element at the cursor to the 
+@code{calc-enter} will copy the element at the cursor to the
 top of the stack and @code{calc-pop} will delete the element at the
 cursor.  The default value of @code{calc-context-sensitive-enter} is
-@code{nil}. 
+@code{nil}.
 @end defvar
 
 @defvar calc-undo-length