Place under GFDL. Fix copyright years.

(Top): Fix markup of quoted chapter names.
(Stack Manipulation, Rearranging with Selections)
(Operations on Variables): Use @kbd instead of @key.
(Installation): Update instructions.  Comment out the description
of the \bumpoddpages macro which was deleted

2 files changed, 56 insertions, 66 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 3ac501fb7a4..20a8fbeb6cc 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,5 +1,9 @@
 2002-01-04  Eli Zaretskii  <eliz@is.elta.co.il>
 
+        * calc.texi: Place under GFDL.  Fix copyright years.
+        (Installation): Update instructions.  Comment out the description
+        of the \bumpoddpages macro which was deleted
+
         * Makefile.in (DVI_TARGETS): Add calc.dvi.
         (calc.dvi): Uncomment.
 
diff --git a/man/calc.texi b/man/calc.texi
index 13f347f2ad9..f560f6f8a2a 100644
--- a/man/calc.texi
+++ b/man/calc.texi
@@ -3,7 +3,7 @@
 @c smallbook
 @setfilename ../info/calc
 @c [title]
-@settitle GNU Emacs Calc 2.02 Manual
+@settitle GNU Emacs Calc 2.02g Manual
 @setchapternewpage odd
 @dircategory Emacs
 @direntry
@@ -81,73 +81,49 @@
 @end ignore
 @end iftex
 
-@ifinfo
+@ifnottex
 This file documents Calc, the GNU Emacs calculator.
 
-Copyright (C) 1990, 1991 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission notice
-identical to this one except for the removal of this paragraph (this
-paragraph not being relevant to the printed manual).
+Copyright (C) 1990, 1991, 2001, 2002 Free Software Foundation, Inc.
 
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-section entitled ``GNU General Public License'' is included exactly as
-in the original, and provided that the entire resulting derived work is
-distributed under the terms of a permission notice identical to this one.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being just ``GNU GENERAL PUBLIC LICENSE'', with the
+Front-Cover texts being ``A GNU Manual,'' and with the Back-Cover
+Texts as in (a) below.
 
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that the section entitled ``GNU General Public License'' may be
-included in a translation approved by the author instead of in the
-original English.
-@end ifinfo
+(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
+this GNU Manual, like GNU software.  Copies published by the Free
+Software Foundation raise funds for GNU development.''
+@end ifnottex
 
 @titlepage
 @sp 6
 @center @titlefont{Calc Manual}
 @sp 4
-@center GNU Emacs Calc Version 2.02
+@center GNU Emacs Calc Version 2.02g
 @c [volume]
 @sp 1
-@center January 1992
+@center January 2002
 @sp 5
 @center Dave Gillespie
 @center daveg@@synaptics.com
 @page
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1990, 1991 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission notice
-identical to this one except for the removal of this paragraph (this
-paragraph not being relevant to the printed manual).
-
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-section entitled ``GNU General Public License'' is included exactly as
-in the original, and provided that the entire resulting derived work is
-distributed under the terms of a permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that the section entitled ``GNU General Public License'' may be
-included in a translation approved by the author instead of in the
-original English.
+Copyright @copyright{} 1990, 1991, 2001, 2002 Free Software Foundation, Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being just ``GNU GENERAL PUBLIC LICENSE'', with the
+Front-Cover texts being ``A GNU Manual,'' and with the Back-Cover
+Texts as in (a) below.
+
+(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
+this GNU Manual, like GNU software.  Copies published by the Free
+Software Foundation raise funds for GNU development.''
 @end titlepage
 
 @c [begin]
@@ -156,14 +132,14 @@ original English.
 @chapter The GNU Emacs Calculator
 
 @noindent
-@dfn{Calc 2.02} is an advanced desk calculator and mathematical tool
+@dfn{Calc} is an advanced desk calculator and mathematical tool
 that runs as part of the GNU Emacs environment.
 
-This manual is divided into three major parts: "Getting Started," the
-"Calc Tutorial," and the "Calc Reference."  The Tutorial introduces all
-the major aspects of Calculator use in an easy, hands-on way.  The
-remainder of the manual is a complete reference to the features of the
-Calculator.
+This manual is divided into three major parts: ``Getting Started,''
+the ``Calc Tutorial,'' and the ``Calc Reference.''  The Tutorial
+introduces all the major aspects of Calculator use in an easy,
+hands-on way.  The remainder of the manual is a complete reference to
+the features of the Calculator.
 
 For help in the Emacs Info system (which you are using to read this
 file), type @kbd{?}.  (You can also type @kbd{h} to run through a
@@ -11917,10 +11893,10 @@ For example, with @samp{10 20 30} on the stack,
 
 @kindex M-@key{DEL}
 @pindex calc-pop-above
-The @key{M-@key{DEL}} (@code{calc-pop-above}) command is to @key{DEL} what
+The @kbd{M-@key{DEL}} (@code{calc-pop-above}) command is to @key{DEL} what
 @key{LFD} is to @key{RET}:  It interprets the sign of the numeric
 prefix argument in the opposite way, and the default argument is 2.
-Thus @key{M-@key{DEL}} by itself removes the second-from-top stack element,
+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.
 
@@ -21653,7 +21629,7 @@ The @kbd{j D} command is implemented using rewrite rules.
 @xref{Selections with Rewrite Rules}.  The rules are stored in
 the Calc variable @code{DistribRules}.  A convenient way to view
 these rules is to use @kbd{s e} (@code{calc-edit-variable}) which
-displays and edits the stored value of a variable.  Press @key{M-# M-#}
+displays and edits the stored value of a variable.  Press @kbd{M-# M-#}
 to return from editing mode; be careful not to make any actual changes
 or else you will affect the behavior of future @kbd{j D} commands!
 
@@ -27845,7 +27821,7 @@ value of a variable without ever putting that value on the stack
 or simplifying or evaluating the value.  It prompts for the name of
 the variable to edit.  If the variable has no stored value, the
 editing buffer will start out empty.  If the editing buffer is
-empty when you press @key{M-# M-#} to finish, the variable will
+empty when you press @kbd{M-# M-#} to finish, the variable will
 be made void.  @xref{Editing Stack Entries}, for a general
 description of editing.
 
@@ -34271,12 +34247,12 @@ at Stanford University) as well as the @file{texindex} program and
 @file{texinfo.tex} file, both of which can be obtained from the FSF
 as part of the @code{texinfo} package.@refill
 
-To print the Calc manual in one huge 550 page tome, you will need the
+To print the Calc manual in one huge 470 page tome, you will need the
 source code to this manual, @file{calc.texi}, available as part of the
-Emacs source.  Once you have this file, type @samp{tex calc.texi}
-twice.  (Running the manual through @TeX{} twice is necessary so that
-references to later parts of the manual will have correct page
-numbers.  (Don't worry if you get some ``overfull box'' warnings.)
+Emacs source.  Once you have this file, type @kbd{texi2dvi calc.texi}.
+Alternatively, change to the @file{man} subdirectory of the Emacs
+source distribution, and type @kbd{make calc.dvi}. (Don't worry if you
+get some ``overfull box'' warnings while @TeX{} runs.)
 
 The result will be a device-independent output file called
 @file{calc.dvi}, which you must print in whatever way is right
@@ -34286,6 +34262,15 @@ for your system.  On many systems, the command is
 lpr -d calc.dvi
 @end example
 
+@noindent
+or
+
+@example
+dvips calc.dvi
+@end example
+
+@c the bumpoddpages macro was deleted
+@ignore
 @cindex Marginal notes, adjusting
 Marginal notes for each function and key sequence normally alternate
 between the left and right sides of the page, which is correct if the
@@ -34293,6 +34278,7 @@ manual is going to be bound as double-sided pages.  Near the top of
 the file @file{calc.texi} you will find alternate definitions of
 the @code{\bumpoddpages} macro that put the marginal notes always on
 the same side, best if you plan to be binding single-sided pages.
+@end ignore
 
 @appendixsec Settings File