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

[Jay Belanger]

------------------------------------------------------------
revno: 111985
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Sat 2013-03-09 17:36:02 -0600
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-08 08:37:59 +0000
+++ b/doc/misc/ChangeLog        2013-03-09 23:36:02 +0000
@@ -1,3 +1,8 @@
+2013-03-09  Jay Belanger  <address@hidden>
+
+       * calc.texi (Basic Operations on Units): Streamline some
+       descriptions.
+
 2013-03-08  Glenn Morris  <address@hidden>
 
        * faq.texi (Top): Don't say this was updated @today.

=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi        2013-03-08 02:11:25 +0000
+++ b/doc/misc/calc.texi        2013-03-09 23:36:02 +0000
@@ -27859,7 +27859,8 @@
 
 If the units you request are inconsistent with the original units, the
 number will be converted into your units times whatever ``remainder''
-units are left over.  For example, converting @samp{55 mph} into acres
+units are left over.  (This can be disabled; @pxref{Customizing Calc}.)
+For example, converting @samp{55 mph} into acres
 produces @samp{6.08e-3 acre / m s}.  (Recall that multiplication binds
 more strongly than division in Calc formulas, so the units here are
 acres per meter-second.)  Remainder units are expressed in terms of
@@ -27875,12 +27876,6 @@
 The ``remainder unit'' @samp{cm} is left alone rather than being
 changed to the base unit @samp{m}.
 
-If you want to disallow using inconsistent units, you can set the
-customizable variable @code{calc-ensure-consistent-units} to @code{t}
-(@pxref{Customizing Calc}).  In this case, if you request units which
-are inconsistent with the original units, you will be warned about it
-and no conversion will occur.
-
 You can use explicit unit conversion instead of the @kbd{u s} command
 to gain more control over the units of the result of an expression.
 For example, given @samp{5 m + 23 mm}, you can type @kbd{u c m} or
@@ -27916,13 +27911,11 @@
 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. You can ignore the prompt for old units with
address@hidden, or turn off the prompt by setting the customizable variable
address@hidden to @code{nil};
address@hidden 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 c} cm @key{RET} in @key{RET}} converts
-the number 2 on the stack to 5.08.
+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.
 
 @kindex u b
 @pindex calc-base-units