Merge from emacs-24

2 files changed, 17 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 6510b56ba3b..7455881518a 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
+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.
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index b53c22030bc..9e9617c10f8 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.