Merge from emacs-24

6 files changed, 53 insertions, 1 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 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.