aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPaul Eggert2019-11-01 17:24:02 -0700
committerPaul Eggert2019-11-01 17:24:47 -0700
commit2f42832895942fdeaa0c500511aa19860fa806cd (patch)
treeb57857577db4a45d62c13c5b4345e6df3b447664 /doc
parent9b1c00b3ca1a1f841cdcfd880536b0dc7669738a (diff)
downloademacs-2f42832895942fdeaa0c500511aa19860fa806cd.tar.gz
emacs-2f42832895942fdeaa0c500511aa19860fa806cd.zip
Omit edition numbers and dates in manuals
These seem to cause more confusion than they cure; e.g., https://shop.fsf.org/books/gnu-emacs-manual-18th-edition-v-261 currently advertises "18th edition" even as it points to https://www.gnu.org/software/emacs/manual/pdf/emacs.pdf which says "Seventeenth Edition". It is simpler and less confusing to stick to one version number like "26.3". If we need a separate edition number for each printed manual for some reason (marketing?) we can put “@ifset printed-edition” around anything specific to the printed editions. (as opposed to online PDF copies). * doc/emacs/emacs.texi (EDITION): * doc/lispintro/emacs-lisp-intro.texi (edition-number, update-date): * doc/lispref/elisp.texi (VERSION, DATE): Remove, and remove uses.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/emacs.texi20
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi7
-rw-r--r--doc/lispref/elisp.texi13
3 files changed, 2 insertions, 38 deletions
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index a7967ecaee5..678ccb9ba51 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -3,28 +3,10 @@
3@setfilename ../../info/emacs.info 3@setfilename ../../info/emacs.info
4@settitle GNU Emacs Manual 4@settitle GNU Emacs Manual
5@include docstyle.texi 5@include docstyle.texi
6
7@c The edition number appears in more than one place in this file
8@c I don't really know what it means...
9@c For example, it has said "Sixteenth" since sometime in the Emacs 22
10@c series, all through 23, and into 24. So it is not very useful IMO,
11@c and offers nothing that EMACSVER does not. I guess it relates
12@c mainly to the published book sold by the FSF. Hence no longer
13@c bother including it except iftex. Really, I think it should not be
14@c here at all (since anyone can make a pdf version), but should just
15@c be something added by the FSF during the publishing process.
16@c Also, the lispref uses a float (3.0), whereas this uses an ordinal,
17@c so the format is not even consistent.
18@set EDITION Seventeenth
19@include emacsver.texi 6@include emacsver.texi
20 7
21@copying 8@copying
22@iftex
23This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
24@end iftex
25@ifnottex
26This is the @cite{GNU Emacs Manual}, 9This is the @cite{GNU Emacs Manual},
27@end ifnottex
28updated for Emacs version @value{EMACSVER}. 10updated for Emacs version @value{EMACSVER}.
29 11
30Copyright @copyright{} 1985--1987, 1993--2019 Free Software Foundation, Inc. 12Copyright @copyright{} 1985--1987, 1993--2019 Free Software Foundation, Inc.
@@ -82,7 +64,7 @@ developing GNU and promoting software freedom.''
82@sp 6 64@sp 6
83@center @titlefont{GNU Emacs Manual} 65@center @titlefont{GNU Emacs Manual}
84@sp 4 66@sp 4
85@center @value{EDITION} Edition, Updated for Emacs Version @value{EMACSVER}. 67@center Updated for Emacs Version @value{EMACSVER}
86@sp 5 68@sp 5
87@center Richard Stallman et al. 69@center Richard Stallman et al.
88@page 70@page
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 489ba8d6ef8..9ad4cf102e3 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -63,10 +63,6 @@
63\global\hbadness=6666 % don't worry about not-too-underfull boxes 63\global\hbadness=6666 % don't worry about not-too-underfull boxes
64@end tex 64@end tex
65 65
66@c These refer to the printed book sold by the FSF.
67@set edition-number 3.10
68@set update-date 28 October 2009
69
70@c For next or subsequent edition: 66@c For next or subsequent edition:
71@c create function using with-output-to-temp-buffer 67@c create function using with-output-to-temp-buffer
72@c create a major mode, with keymaps 68@c create a major mode, with keymaps
@@ -106,9 +102,6 @@
106This is @cite{An Introduction to Programming in Emacs Lisp}, for 102This is @cite{An Introduction to Programming in Emacs Lisp}, for
107people who are not programmers. 103people who are not programmers.
108@sp 1 104@sp 1
109@iftex
110Edition @value{edition-number}, @value{update-date}
111@end iftex
112@ifnottex 105@ifnottex
113Distributed with Emacs version @value{EMACSVER}. 106Distributed with Emacs version @value{EMACSVER}.
114@end ifnottex 107@end ifnottex
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index d667c51d788..652175c3952 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -52,12 +52,7 @@
52@end ifset 52@end ifset
53@end tex 53@end tex
54 54
55
56@c Version of the manual and of Emacs.
57@c (See comments for EDITION in emacs.texi)
58@set VERSION 3.1
59@include emacsver.texi 55@include emacsver.texi
60@set DATE October 2014
61 56
62@c in general, keep the following line commented out, unless doing a 57@c in general, keep the following line commented out, unless doing a
63@c copy of this manual that will be published. The manual should go 58@c copy of this manual that will be published. The manual should go
@@ -91,12 +86,7 @@
91@c @syncodeindex tp fn 86@c @syncodeindex tp fn
92 87
93@copying 88@copying
94@iftex 89This is the @cite{GNU Emacs Lisp Reference Manual},
95This is edition @value{VERSION} of the @cite{GNU Emacs Lisp Reference Manual},@*
96@end iftex
97@ifnottex
98This is the @cite{GNU Emacs Lisp Reference Manual}
99@end ifnottex
100corresponding to Emacs version @value{EMACSVER}. 90corresponding to Emacs version @value{EMACSVER}.
101 91
102Copyright @copyright{} 1990--1996, 1998--2019 Free Software Foundation, Inc. 92Copyright @copyright{} 1990--1996, 1998--2019 Free Software Foundation, Inc.
@@ -127,7 +117,6 @@ developing GNU and promoting software freedom.''
127@subtitle @value{voltitle} 117@subtitle @value{voltitle}
128@end ifset 118@end ifset
129@subtitle For Emacs Version @value{EMACSVER} 119@subtitle For Emacs Version @value{EMACSVER}
130@subtitle Revision @value{VERSION}, @value{DATE}
131 120
132@author by Bil Lewis, Dan LaLiberte, Richard Stallman, 121@author by Bil Lewis, Dan LaLiberte, Richard Stallman,
133@author the GNU Manual Group, et al. 122@author the GNU Manual Group, et al.