merge from trunk

3 files changed, 22 insertions, 1 deletions

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.