[Emacs-diffs] Changes to emacs/man/calc.texi

[Jay Belanger]

Index: emacs/man/calc.texi
diff -c emacs/man/calc.texi:1.67 emacs/man/calc.texi:1.68
*** emacs/man/calc.texi:1.67    Mon May 30 21:04:46 2005
--- emacs/man/calc.texi Tue May 31 16:35:05 2005
***************
*** 583,588 ****
--- 583,589 ----
  * What is Calc::
  * About This Manual::
  * Notations Used in This Manual::
+ * Demonstration of Calc::
  * Using Calc::
  * Demonstration of Calc::
  * History and Acknowledgements::
***************
*** 764,770 ****
  (If you don't have the @key{LFD} or @key{TAB} keys on your keyboard,
  the @kbd{C-j} and @kbd{C-i} keys are equivalent to them, respectively.
  If you don't have a Meta key, look for Alt or Extend Char.  You can
! also press @key{ESC} or @key{C-[} first to get the same effect, so
  that @kbd{M-x}, @address@hidden x}, and @kbd{C-[ x} are all equivalent.)
  
  Sometimes the @key{RET} key is not shown when it is ``obvious''
--- 765,771 ----
  (If you don't have the @key{LFD} or @key{TAB} keys on your keyboard,
  the @kbd{C-j} and @kbd{C-i} keys are equivalent to them, respectively.
  If you don't have a Meta key, look for Alt or Extend Char.  You can
! also press @key{ESC} or @kbd{C-[} first to get the same effect, so
  that @kbd{M-x}, @address@hidden x}, and @kbd{C-[ x} are all equivalent.)
  
  Sometimes the @key{RET} key is not shown when it is ``obvious''
***************
*** 797,803 ****
  
  To begin, start Emacs if necessary (usually the command @code{emacs}
  does this), and type @kbd{M-# c} (or @address@hidden # c}) to start the
! Calculator.  (@xref{Starting Calc}, if this doesn't work for you.)
  
  Be sure to type all the sample input exactly, especially noting the
  difference between lower-case and upper-case letters.  Remember,
--- 798,805 ----
  
  To begin, start Emacs if necessary (usually the command @code{emacs}
  does this), and type @kbd{M-# c} (or @address@hidden # c}) to start the
! Calculator.  (You can also use @kbd{M-x calc} if this doesn't work.
! @xref{Starting Calc}, for various ways of starting the Calculator.)
  
  Be sure to type all the sample input exactly, especially noting the
  difference between lower-case and upper-case letters.  Remember,
***************
*** 987,997 ****
  Control or @key{CTRL} while typing a left square bracket
  (that's @kbd{C-[} in Emacs notation).
  
! @kbd{M-#} is a @dfn{prefix key}; when you press it, Emacs waits for
! you to press a second key to complete the command.  In this case,
! you will follow @kbd{M-#} with a letter (upper- or lower-case, it
! doesn't matter for @kbd{M-#}) that says which Calc interface you
! want to use.
  
  To get Calc's standard interface, type @kbd{M-# c}.  To get
  Keypad mode, type @kbd{M-# k}.  Type @kbd{M-# ?} to get a brief
--- 989,1003 ----
  Control or @key{CTRL} while typing a left square bracket
  (that's @kbd{C-[} in Emacs notation).
  
! The key @kbd{M-#} is bound to the command @code{calc-dispatch}, 
! which can be rebound if convenient.  
! (@xref{Key Bindings,,Customizing Key Bindings,emacs,
! The GNU Emacs Manual}.)
! 
! When you press @kbd{M-#}, Emacs waits for you to press a second key to
! complete the command.  In this case, you will follow @kbd{M-#} with a
! letter (upper- or lower-case, it doesn't matter for @kbd{M-#}) that says
! which Calc interface you want to use.
  
  To get Calc's standard interface, type @kbd{M-# c}.  To get
  Keypad mode, type @kbd{M-# k}.  Type @kbd{M-# ?} to get a brief
***************
*** 1335,1343 ****
  @end smallexample
  
  To leave Embedded mode, type @kbd{M-# e} again.  The mode line
! and keyboard will revert to the way they were before.  (If you have
! actually been trying this as you read along, you'll want to press
! @kbd{M-# 0} [with the digit zero] now to reset the modes you changed.)
  
  The related command @kbd{M-# w} operates on a single word, which
  generally means a single number, inside text.  It uses any
--- 1341,1347 ----
  @end smallexample
  
  To leave Embedded mode, type @kbd{M-# e} again.  The mode line
! and keyboard will revert to the way they were before.
  
  The related command @kbd{M-# w} operates on a single word, which
  generally means a single number, inside text.  It uses any
***************
*** 1520,1527 ****
  
  @item 0
  (This is the ``zero'' digit key.)  Reset the Calculator to
! its default state:  Empty stack, and default mode settings.
! With any prefix argument, reset everything but the stack.
  @end table
  
  @node History and Acknowledgements, , Using Calc, Getting Started
--- 1524,1530 ----
  
  @item 0
  (This is the ``zero'' digit key.)  Reset the Calculator to
! its initial state:  Empty stack, and initial mode settings.
  @end table
  
  @node History and Acknowledgements, , Using Calc, Getting Started
***************
*** 1589,1595 ****
  features, large and small.  A few deserve special mention:  Tim Peters,
  who helped develop the ideas that led to the selection commands, rewrite
  rules, and many other algebra features; 
! @texline Fran\c cois
  @infoline Francois
  Pinard, who contributed an early prototype of the Calc Summary appendix
  as well as providing valuable suggestions in many other areas of Calc;
--- 1592,1598 ----
  features, large and small.  A few deserve special mention:  Tim Peters,
  who helped develop the ideas that led to the selection commands, rewrite
  rules, and many other algebra features; 
! @texline Fran\c{c}ois
  @infoline Francois
  Pinard, who contributed an early prototype of the Calc Summary appendix
  as well as providing valuable suggestions in many other areas of Calc;