merge from trunk

10 files changed, 77 insertions, 17 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 776e5c6191e..d2554349d01 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,11 @@
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * emacs.texi (Top): Add some stuff specific to www.gnu.org.
+
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * Version 24.3 released.
+
 2013-03-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Prefer UTF-8 for documentation.
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 2efa9b084df..e78eb7845f3 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -111,10 +111,21 @@ Cover art by Etienne Suvasa; cover design by Matt Lee.
 @top The Emacs Editor
 
 Emacs is the extensible, customizable, self-documenting real-time
-display editor.  This Info file describes how to edit with Emacs and
+display editor.  This manual describes how to edit with Emacs and
 some of the ways to customize it; it corresponds to GNU Emacs version
 @value{EMACSVER}.
 
+@ifset WWW_GNU_ORG
+@html
+The homepage for GNU Emacs is at
+<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br>
+To view this manual in other formats, click
+<a href="/software/emacs/manual/emacs.html">here</a>.<br>
+You can also purchase a printed copy from the
+<a href="http://shop.fsf.org/product/emacs-manual/">FSF store</a>.
+@end html
+@end ifset
+
 @ifinfo
 If you are reading this in Emacs, type @kbd{h} to read a basic
 introduction to the Info documentation system.
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index e31c63fd8f6..e12c57d4b76 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,11 @@
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp-intro.texi: Add some stuff specific to www.gnu.org.
+
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * Version 24.3 released.
+
 2013-03-03  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp-intro.texi (Digression into C): Update example.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 43e2539d2f2..c42ed210cbc 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -227,6 +227,14 @@ This is an @cite{Introduction to Programming in Emacs Lisp}, for
 people who are not programmers.
 @sp 1
 Edition @value{edition-number}, @value{update-date}
+@ifset WWW_GNU_ORG
+@html
+<p>The homepage for GNU Emacs is at
+<a href="http://www.gnu.org/software/emacs/">http://www.gnu.org/software/emacs/</a>.
+<br>To view this manual in other formats, click
+<a href="/software/emacs/emacs-lisp-intro/emacs-lisp-intro.html">here</a>.
+@end html
+@end ifset
 @sp 1
 Copyright @copyright{} 1990--1995, 1997, 2001--2013 Free Software
 Foundation, Inc.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3c976d37062..7455881518a 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,14 @@
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * elisp.texi: Add some stuff specific to www.gnu.org.
+
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * Version 24.3 released.
+2013-03-11  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * control.texi (Pattern matching case statement): Fix typo.
+
 2013-03-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         * elisp.texi, intro.texi: Switch from Latin-1 to UTF-8.
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 76a2f464792..9ee01299260 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -373,7 +373,7 @@ symbol to the value that it matched, so that you can later refer to it, either
 in the @var{body-forms} or also later in the pattern.
 @item _
 This so-called @emph{don't care} pattern matches anything, like the previous
-one, but unless symbol patterns it does not bind any variable.
+one, but unlike symbol patterns it does not bind any variable.
 @item (pred @var{pred})
 This pattern matches if the function @var{pred} returns non-@code{nil} when
 called with the object being matched.
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 66fda259d7d..343d9cc98e2 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -97,6 +97,16 @@ This is edition @value{VERSION} of the @cite{GNU Emacs Lisp Reference Manual},@*
 This is the @cite{GNU Emacs Lisp Reference Manual}
 @end ifnottex
 corresponding to Emacs version @value{EMACSVER}.
+@ifset WWW_GNU_ORG
+@html
+<p>The homepage for GNU Emacs is at
+<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br>
+For information on using Emacs, refer to
+the <a href="/software/emacs/manual/html_node/emacs/index.html">Emacs
+Manual</a>.<br>  To view this manual in other formats,
+click <a href="/software/emacs/manual/elisp.html">here</a>.
+@end html
+@end ifset
 
 Copyright @copyright{} 1990--1996, 1998--2013 Free Software Foundation, Inc.
 
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