summaryrefslogtreecommitdiff
path: root/doc/lispintro
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-03-16 18:08:22 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-03-16 18:08:22 -0400
commit78be8b64657aeca0472d708450ea1ce2bc142606 (patch)
treedccbdc45e747a47b44be92abab79cca15a30111f /doc/lispintro
parent6615748ac6bcff258ef548f70bdcc1ab9f740472 (diff)
parent67ed8fcd04edeff2d4931acf476e7067c5ceeef2 (diff)
downloademacs-78be8b64657aeca0472d708450ea1ce2bc142606.tar.gz
Merge from emacs-24
Diffstat (limited to 'doc/lispintro')
-rw-r--r--doc/lispintro/ChangeLog8
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi8
2 files changed, 16 insertions, 0 deletions
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.