aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-03-12 00:15:15 -0700
committerGlenn Morris2013-03-12 00:15:15 -0700
commitc07659054603ef1d7ce4eaeb5b79b50131abf265 (patch)
tree6493dc5e0851d752437ae5a10132ff3a82a77e46
parentc69f46735f5bde557071785117eb0759829dc19c (diff)
downloademacs-c07659054603ef1d7ce4eaeb5b79b50131abf265.tar.gz
emacs-c07659054603ef1d7ce4eaeb5b79b50131abf265.zip
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.
-rw-r--r--admin/ChangeLog4
-rw-r--r--admin/admin.el2
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/emacs.texi13
-rw-r--r--doc/lispintro/ChangeLog4
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi8
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/elisp.texi10
8 files changed, 48 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6c9ed389528..bf37688c337 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12013-03-12 Glenn Morris <rgm@gnu.org>
2
3 * admin.el (manual-html-mono, manual-html-node): Add -DWWW_GNU_ORG.
4
12013-03-11 Glenn Morris <rgm@gnu.org> 52013-03-11 Glenn Morris <rgm@gnu.org>
2 6
3 * admin.el (make-manuals): Add emacs-lisp-intro and some more 7 * admin.el (make-manuals): Add emacs-lisp-intro and some more
diff --git a/admin/admin.el b/admin/admin.el
index 08d9039d4bc..ea08c0d1c74 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -268,6 +268,7 @@ This function also edits the HTML files so that they validate as
268HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using 268HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using
269the @import directive." 269the @import directive."
270 (call-process "makeinfo" nil nil nil 270 (call-process "makeinfo" nil nil nil
271 "-D" "WWW_GNU_ORG"
271 "-I" (expand-file-name "../emacs" 272 "-I" (expand-file-name "../emacs"
272 (file-name-directory texi-file)) 273 (file-name-directory texi-file))
273 "-I" (expand-file-name "../misc" 274 "-I" (expand-file-name "../misc"
@@ -293,6 +294,7 @@ the @import directive."
293 (unless (file-exists-p texi-file) 294 (unless (file-exists-p texi-file)
294 (error "Manual file %s not found" texi-file)) 295 (error "Manual file %s not found" texi-file))
295 (call-process "makeinfo" nil nil nil 296 (call-process "makeinfo" nil nil nil
297 "-D" "WWW_GNU_ORG"
296 "-I" (expand-file-name "../emacs" 298 "-I" (expand-file-name "../emacs"
297 (file-name-directory texi-file)) 299 (file-name-directory texi-file))
298 "-I" (expand-file-name "../misc" 300 "-I" (expand-file-name "../misc"
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 330bcfaaaee..e4c36533caf 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12013-03-12 Glenn Morris <rgm@gnu.org>
2
3 * emacs.texi (Top): Add some stuff specific to www.gnu.org.
4
12013-03-11 Glenn Morris <rgm@gnu.org> 52013-03-11 Glenn Morris <rgm@gnu.org>
2 6
3 * Version 24.3 released. 7 * Version 24.3 released.
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index bda7c0821c0..972304ac575 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.
111@top The Emacs Editor 111@top The Emacs Editor
112 112
113Emacs is the extensible, customizable, self-documenting real-time 113Emacs is the extensible, customizable, self-documenting real-time
114display editor. This Info file describes how to edit with Emacs and 114display editor. This manual describes how to edit with Emacs and
115some of the ways to customize it; it corresponds to GNU Emacs version 115some of the ways to customize it; it corresponds to GNU Emacs version
116@value{EMACSVER}. 116@value{EMACSVER}.
117 117
118@ifset WWW_GNU_ORG
119@html
120The homepage for GNU Emacs is at
121<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br>
122To view this manual in other formats, click
123<a href="/software/emacs/manual/emacs.html">here</a>.<br>
124You can also purchase a printed copy from the
125<a href="http://shop.fsf.org/product/emacs-manual/">FSF store</a>.
126@end html
127@end ifset
128
118@ifinfo 129@ifinfo
119If you are reading this in Emacs, type @kbd{h} to read a basic 130If you are reading this in Emacs, type @kbd{h} to read a basic
120introduction to the Info documentation system. 131introduction to the Info documentation system.
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 6a3cffac520..4dd7c0e00a5 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
12013-03-12 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp-intro.texi: Add some stuff specific to www.gnu.org.
4
12013-03-11 Glenn Morris <rgm@gnu.org> 52013-03-11 Glenn Morris <rgm@gnu.org>
2 6
3 * Version 24.3 released. 7 * Version 24.3 released.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 055ed557825..13e12b52785 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
227people who are not programmers. 227people who are not programmers.
228@sp 1 228@sp 1
229Edition @value{edition-number}, @value{update-date} 229Edition @value{edition-number}, @value{update-date}
230@ifset WWW_GNU_ORG
231@html
232<p>The homepage for GNU Emacs is at
233<a href="http://www.gnu.org/software/emacs/">http://www.gnu.org/software/emacs/</a>.
234<br>To view this manual in other formats, click
235<a href="/software/emacs/emacs-lisp-intro/emacs-lisp-intro.html">here</a>.
236@end html
237@end ifset
230@sp 1 238@sp 1
231Copyright @copyright{} 1990--1995, 1997, 2001--2013 Free Software 239Copyright @copyright{} 1990--1995, 1997, 2001--2013 Free Software
232Foundation, Inc. 240Foundation, Inc.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7b1e9f6a9ad..36dd05b125a 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12013-03-12 Glenn Morris <rgm@gnu.org>
2
3 * elisp.texi: Add some stuff specific to www.gnu.org.
4
12013-03-11 Glenn Morris <rgm@gnu.org> 52013-03-11 Glenn Morris <rgm@gnu.org>
2 6
3 * Version 24.3 released. 7 * Version 24.3 released.
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 5ad9e8212a5..9acbf85534e 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},@*
97This is the @cite{GNU Emacs Lisp Reference Manual} 97This is the @cite{GNU Emacs Lisp Reference Manual}
98@end ifnottex 98@end ifnottex
99corresponding to Emacs version @value{EMACSVER}. 99corresponding to Emacs version @value{EMACSVER}.
100@ifset WWW_GNU_ORG
101@html
102<p>The homepage for GNU Emacs is at
103<a href="/software/emacs/">http://www.gnu.org/software/emacs/</a>.<br>
104For information on using Emacs, refer to
105the <a href="/software/emacs/manual/html_node/emacs/index.html">Emacs
106Manual</a>.<br> To view this manual in other formats,
107click <a href="/software/emacs/manual/elisp.html">here</a>.
108@end html
109@end ifset
100 110
101Copyright @copyright{} 1990--1996, 1998--2013 Free Software Foundation, Inc. 111Copyright @copyright{} 1990--1996, 1998--2013 Free Software Foundation, Inc.
102 112