* doc/misc/calc.texi (Basic Operations on Units): Streamline some

  descriptions.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 2b58a61570e72b7cf789b0a56ce54ede59b375f0..285097c5553ec32c3fc0de4f2168781dea5b8a5c 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-31  Jay Belanger  <jay.p.belanger@gmail.com>
+
+       * calc.texi: (Basic Operations on Units): Streamline some
+       descriptions.
+
 2013-03-27  Aidan Gauland  <aidalgol@no8wireless.co.nz>
 
        * eshell.texi (Built-ins): Update manual to mention tramp module.

diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 44462d1d5a8eb300ab29295f37264cbb0d3d328a..b2b054ec1eaa6fe9bc5042813cb26cc6aceb3b09 100644 (file)
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -27911,11 +27911,10 @@ prompt first for the old units which this value should be considered
 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,
-@kbd{@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, @kbd{@w{u 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 @@ have different dimensions. The default value of @code{calc-ensure-consistent-uni
 is @code{nil}.
 @end defvar
 
-@defvar 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 
-@code{calc-allow-units-as-numbers} is non-@code{nil}, 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}.
-@end 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.