[Emacs-diffs] /srv/bzr/emacs/trunk r112204: * doc/misc/calc.texi (Basic Operations on Units): Streamline some

[Jay Belanger]

------------------------------------------------------------
revno: 112204
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Sun 2013-03-31 15:27:40 -0500
message:
  * doc/misc/calc.texi (Basic Operations on Units): Streamline some
    descriptions.
modified:
  doc/misc/ChangeLog
  doc/misc/calc.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-03-30 19:31:27 +0000
+++ b/doc/misc/ChangeLog        2013-03-31 20:27:40 +0000
@@ -1,3 +1,8 @@
+2013-03-31  Jay Belanger  <address@hidden>
+
+       * calc.texi: (Basic Operations on Units): Streamline some
+       descriptions.
+
 2013-03-27  Aidan Gauland  <address@hidden>
 
        * eshell.texi (Built-ins): Update manual to mention tramp module.

=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi        2013-03-09 23:36:02 +0000
+++ b/doc/misc/calc.texi        2013-03-31 20:27:40 +0000
@@ -27911,11 +27911,10 @@
 to have, then for the new units.  (If the value on the stack can be
 simplified so that it doesn't contain any units, like @samp{ft/in} can
 be simplified to 12, then @kbd{u c} will still prompt for both old
-units and new units. This can be disabled; @pxref{Customizing Calc}.)  
-Assuming the old and new units you give are consistent with each
-other, the result also will not contain any units.  For example,
address@hidden@w{u c} cm @key{RET} in @key{RET}} converts the number 2 on the
-stack to 5.08.
+units and new units.   Assuming the old and new units you give are
+consistent with each other, the result also will not contain any
+units.  For example, @address@hidden c} cm @key{RET} in @key{RET}} converts
+the number 2 on the stack to 5.08.
 
 @kindex u b
 @pindex calc-base-units
@@ -35694,17 +35693,6 @@
 is @code{nil}.
 @end defvar
 
address@hidden calc-allow-units-as-numbers
-When converting units, the variable @code{calc-allow-units-as-numbers}
-determines whether or not values which can be simplified so that
-they don't contain units (such as @samp{ft/in} can be simplified to 12)
-can be regarded as not containing units.  If 
address@hidden is address@hidden, then @kbd{u c}
-will prompt for both old units and new units when converting an expression
-like @samp{ft/in}, otherwise @kbd{u c} will only prompt for the new units.
-The default value of @code{calc-allow-units-as-numbers} is @code{t}.
address@hidden defvar
-
 @defvar calc-undo-length
 The variable @code{calc-undo-length} determines the number of undo
 steps that Calc will keep track of when @code{calc-quit} is called.