3 files changed, 19 insertions, 15 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 44a0b7b3211..45862f93f0c 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,14 @@
+2013-03-15  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.2.7.
+
+        * trampver.texi: Update release number.
+
+2013-03-09  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc.texi (Basic Operations on Units): Streamline some
+        descriptions.
+
 2013-03-08  Glenn Morris  <rgm@gnu.org>
 
         * faq.texi (Top): Don't say this was updated @today.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 0bf7833ec34..44462d1d5a8 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -27859,7 +27859,8 @@ while typing @kbd{u c au/yr @key{RET}} produces
 
 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 @@ change the @samp{s} to @samp{ms} to get @samp{9.8e-4 cm/ms^2}.
 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 @@ 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. You can ignore the prompt for old units with
-@key{RET}, or turn off the prompt by setting the customizable variable
-@code{calc-allow-units-as-numbers} to @code{nil};
-@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. 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.
 
 @kindex u b
 @pindex calc-base-units
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 6d5a8cb1c44..18c4252e6d2 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.2.7-pre
+@set trampver 2.2.7
 
 @c Other flags from configuration
 @set instprefix /usr/local