Tweaks for www.gnu.org html versions of manuals

* admin/admin.el (manual-html-mono, manual-html-node): Add -DWWW_GNU_ORG.

* doc/emacs/emacs.texi (Top): Add some stuff specific to www.gnu.org.

* doc/lispintro/emacs-lisp-intro.texi: Add some stuff specific to www.gnu.org.

* doc/lispref/elisp.texi: Add some stuff specific to www.gnu.org.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6c9ed389528e3aa0b091d57cb7d6ea62278ac3b8..bf37688c3370ce62674dfc77ce4120b6d2a0420a 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-12  Glenn Morris  <rgm@gnu.org>
+
+       * admin.el (manual-html-mono, manual-html-node): Add -DWWW_GNU_ORG.
+
 2013-03-11  Glenn Morris  <rgm@gnu.org>
 
        * admin.el (make-manuals): Add emacs-lisp-intro and some more

diff --git a/admin/admin.el b/admin/admin.el
index 08d9039d4bcd2e22594035a5e577ecc4404cb661..ea08c0d1c74e127c42b66112fd1162e80a4ffb30 100644 (file)
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -268,6 +268,7 @@ This function also edits the HTML files so that they validate as
 HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using
 the @import directive."
   (call-process "makeinfo" nil nil nil
+               "-D" "WWW_GNU_ORG"
                "-I" (expand-file-name "../emacs"
                                       (file-name-directory texi-file))
                "-I" (expand-file-name "../misc"
@@ -293,6 +294,7 @@ the @import directive."
   (unless (file-exists-p texi-file)
     (error "Manual file %s not found" texi-file))
   (call-process "makeinfo" nil nil nil
+               "-D" "WWW_GNU_ORG"
                "-I" (expand-file-name "../emacs"
                                       (file-name-directory texi-file))
                "-I" (expand-file-name "../misc"

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 330bcfaaaee8499cdef0cc55588b1ed1c1e6986a..e4c36533caf1e0bcd575bcdae3a2adf475dc0685 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-12  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.texi (Top): Add some stuff specific to www.gnu.org.
+
 2013-03-11  Glenn Morris  <rgm@gnu.org>
 
        * Version 24.3 released.

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index bda7c0821c0946b50d25f5758bcd8a267342e61a..972304ac575cabaf35a4035a1d41c13f9ca4c557 100644 (file)
--- 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 6a3cffac520b29dce272601d9dc803a3cbf39ae8..4dd7c0e00a51f875519493b7b03e8b96627b7df6 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-12  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp-intro.texi: Add some stuff specific to www.gnu.org.
+
 2013-03-11  Glenn Morris  <rgm@gnu.org>
 
        * Version 24.3 released.

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 055ed557825b86185341ac5504891c534023f315..13e12b52785ed11c19c407a0dba7c36f8639d98c 100644 (file)
--- 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 7b1e9f6a9add78c514083f5321af83df30f21f5f..36dd05b125aa36c8d09050dae00f63f3b1e12ee0 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-12  Glenn Morris  <rgm@gnu.org>
+
+       * elisp.texi: Add some stuff specific to www.gnu.org.
+
 2013-03-11  Glenn Morris  <rgm@gnu.org>
 
        * Version 24.3 released.

diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 5ad9e8212a57bb51fa8d62212ad2641c8191610d..9acbf85534e9938d04dfda8fddf68ec49ac9704a 100644 (file)
--- 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.