Switch to recommended form of GPLv3 permissions notice.

author: Glenn Morris 2008-05-16 05:22:47 +0000
committer: Glenn Morris 2008-05-16 05:22:47 +0000
commit: 97c0352c515bc9501132e52b506aa58f2211c2c2 (patch)
tree: 19d950c24a8b9bf567157f8c0fca1ae872058e1d
parent: a58041570c73483f0281893e15b8f52394d6484a (diff)
download: emacs-97c0352c515bc9501132e52b506aa58f2211c2c2.tar.gz
emacs-97c0352c515bc9501132e52b506aa58f2211c2c2.zip
7 files changed, 39 insertions, 52 deletions
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 8a3a196d71d..c82a77d9973 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -30,10 +30,10 @@
  This file is part of GNU Emacs.
-  GNU Emacs is free software; you can redistribute it and/or modify
+  GNU Emacs is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 3, or (at your option)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (at your option) any later version.
  GNU Emacs is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -41,8 +41,6 @@
  GNU General Public License for more details.
  You should have received a copy of the GNU General Public License
-  along with GNU Emacs; see the file COPYING.  If not, write to the
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
 ;; arch-tag: 2bd1112e-157f-4884-b0ca-0fb1057972d7
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index eac290c07a5..73ecae18f28 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -4,10 +4,10 @@
 .\"
 .\" This file is part of GNU Emacs.
 .\"
-.\" GNU Emacs is free software; you can redistribute it and/or modify
+.\" GNU Emacs is free software: you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation; either version 3, or (at your option)
+.\" the Free Software Foundation, either version 3 of the License, or
-.\" any later version.
+.\" (at your option) any later version.
 .\"
 .\" GNU Emacs is distributed in the hope that it will be useful,
 .\" but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@
 .\" GNU General Public License for more details.
 .\"
 .\" You should have received a copy of the GNU General Public License
-.\" along with GNU Emacs; see the file COPYING.  If not, write to the
+.\" along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-.\" Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-.\" Boston, MA 02110-1301, USA.
 .\"
 '\" t
 .TH EMACS 1 "2007 April 13" "GNU Emacs 23.0.60"
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 80af3824e05..9cb1746ce1f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -5017,10 +5017,10 @@
  This file is part of GNU Emacs.
-  GNU Emacs is free software; you can redistribute it and/or modify
+  GNU Emacs is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 3, or (at your option)
+  the Free Software Foundation, either version 3 of the License, or
-  any later version.
+  (at your option) any later version.
  GNU Emacs is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -5028,8 +5028,6 @@
  GNU General Public License for more details.
  You should have received a copy of the GNU General Public License
-  along with GNU Emacs; see the file COPYING.  If not, write to the
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
 ;; arch-tag: 08b2903e-900c-4c72-a4a9-e76416a80803
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 4460b6f596c..8d4e5cae80f 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -5,10 +5,10 @@
 # This file is part of GNU Emacs.
-# GNU Emacs is free software; you can redistribute it and/or modify
+# GNU Emacs is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
+# the Free Software Foundation, either version 3 of the License, or
-# any later version.
+# (at your option) any later version.
 # GNU Emacs is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
 # Where to find the source code.  $(srcdir) will be the man-aux
diff --git a/doc/misc/gnus-news.el b/doc/misc/gnus-news.el
index 5e8999a80dd..aa02c3110e1 100644
--- a/doc/misc/gnus-news.el
+++ b/doc/misc/gnus-news.el
@@ -6,10 +6,10 @@
 ;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
+;; the Free Software Foundation, either version 3 of the License, or
-;; any later version.
+;; (at your option) any later version.
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +17,7 @@
 ;; GNU General Public License for more details.
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
 ;;; Commentary:
@@ -43,10 +41,10 @@ For older news, see Gnus info node \"New Features\".\n\n")
 This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
+the Free Software Foundation, either version 3 of the License, or
-any later version.
+(at your option) any later version.
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -54,9 +52,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to the
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
 \nLocal variables:\nmode: outline
 paragraph-separate: \"[         ]*$\"\nend:\n")
@@ -117,5 +113,5 @@ paragraph-separate: \"[ 	]*$\"\nend:\n")
      (insert gnus-news-trailer)
      (write-region (point-min) (point-max) outfile))))
-;;; arch-tag: e23cdd27-eafd-4ba0-816f-98f5edb0dc29
+;; arch-tag: e23cdd27-eafd-4ba0-816f-98f5edb0dc29
 ;;; gnus-news.el ends here
diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in
index 5af65f1d3ee..668debc9f89 100644
--- a/doc/misc/makefile.w32-in
+++ b/doc/misc/makefile.w32-in
@@ -1,13 +1,14 @@
 #### -*- Makefile -*- for documentation other than the Emacs manual.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
-# GNU Emacs is free software; you can redistribute it and/or modify
+# GNU Emacs is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
+# the Free Software Foundation, either version 3 of the License, or
-# any later version.
+# (at your option) any later version.
 # GNU Emacs is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
 # Where to find the source code.  The source code for Emacs's C kernel is
 # expected to be in $(srcdir)/src, and the source code for Emacs's
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 2946574c408..8d6803f20ec 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -9652,19 +9652,18 @@ the ``copyright'' line and a pointer to where the full notice is found.
 @var{one line to give the program's name and an idea of what it does.}
 Copyright (C) @var{yyyy}  @var{name of author}
-This program is free software; you can redistribute it and/or
+This program is free software: you can redistribute it and/or modify
-modify it under the terms of the GNU General Public License
+it under the terms of the GNU General Public License as published by
-as published by the Free Software Foundation; either version 3
+the Free Software Foundation, either version 3 of the License, or
-of the License, or (at your option) any later version.
+(at your option) any later version.
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU General Public License
-with this program; if not, write to the Free Software Foundation, Inc.,
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 @end smallexample
 Also add information on how to contact you by electronic and paper mail.
author	Glenn Morris	2008-05-16 05:22:47 +0000
committer	Glenn Morris	2008-05-16 05:22:47 +0000
commit	97c0352c515bc9501132e52b506aa58f2211c2c2 (patch)
tree	19d950c24a8b9bf567157f8c0fca1ae872058e1d
parent	a58041570c73483f0281893e15b8f52394d6484a (diff)
download	emacs-97c0352c515bc9501132e52b506aa58f2211c2c2.tar.gz emacs-97c0352c515bc9501132e52b506aa58f2211c2c2.zip

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 8a3a196d71d..c82a77d9973 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog
@@ -30,10 +30,10 @@
30		30
31	This file is part of GNU Emacs.	31	This file is part of GNU Emacs.
32		32
33	GNU Emacs is free software; you can redistribute it and/or modify	33	GNU Emacs is free software: you can redistribute it and/or modify
34	it under the terms of the GNU General Public License as published by	34	it under the terms of the GNU General Public License as published by
35	the Free Software Foundation; either version 3, or (at your option)	35	the Free Software Foundation, either version 3 of the License, or
36	any later version.	36	(at your option) any later version.
37		37
38	GNU Emacs is distributed in the hope that it will be useful,	38	GNU Emacs is distributed in the hope that it will be useful,
39	but WITHOUT ANY WARRANTY; without even the implied warranty of	39	but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -41,8 +41,6 @@
41	GNU General Public License for more details.	41	GNU General Public License for more details.
42		42
43	You should have received a copy of the GNU General Public License	43	You should have received a copy of the GNU General Public License
44	along with GNU Emacs; see the file COPYING. If not, write to the	44	along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
45	Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
46	Boston, MA 02110-1301, USA.
47		45
48	;; arch-tag: 2bd1112e-157f-4884-b0ca-0fb1057972d7	46	;; arch-tag: 2bd1112e-157f-4884-b0ca-0fb1057972d7


diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index eac290c07a5..73ecae18f28 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1
@@ -4,10 +4,10 @@
4	.\"	4	.\"
5	.\" This file is part of GNU Emacs.	5	.\" This file is part of GNU Emacs.
6	.\"	6	.\"
7	.\" GNU Emacs is free software; you can redistribute it and/or modify	7	.\" GNU Emacs is free software: you can redistribute it and/or modify
8	.\" it under the terms of the GNU General Public License as published by	8	.\" it under the terms of the GNU General Public License as published by
9	.\" the Free Software Foundation; either version 3, or (at your option)	9	.\" the Free Software Foundation, either version 3 of the License, or
10	.\" any later version.	10	.\" (at your option) any later version.
11	.\"	11	.\"
12	.\" GNU Emacs is distributed in the hope that it will be useful,	12	.\" GNU Emacs is distributed in the hope that it will be useful,
13	.\" but WITHOUT ANY WARRANTY; without even the implied warranty of	13	.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@
15	.\" GNU General Public License for more details.	15	.\" GNU General Public License for more details.
16	.\"	16	.\"
17	.\" You should have received a copy of the GNU General Public License	17	.\" You should have received a copy of the GNU General Public License
18	.\" along with GNU Emacs; see the file COPYING. If not, write to the	18	.\" along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
19	.\" Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20	.\" Boston, MA 02110-1301, USA.
21	.\"	19	.\"
22	'\" t	20	'\" t
23	.TH EMACS 1 "2007 April 13" "GNU Emacs 23.0.60"	21	.TH EMACS 1 "2007 April 13" "GNU Emacs 23.0.60"


diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 80af3824e05..9cb1746ce1f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog
@@ -5017,10 +5017,10 @@
5017		5017
5018	This file is part of GNU Emacs.	5018	This file is part of GNU Emacs.
5019		5019
5020	GNU Emacs is free software; you can redistribute it and/or modify	5020	GNU Emacs is free software: you can redistribute it and/or modify
5021	it under the terms of the GNU General Public License as published by	5021	it under the terms of the GNU General Public License as published by
5022	the Free Software Foundation; either version 3, or (at your option)	5022	the Free Software Foundation, either version 3 of the License, or
5023	any later version.	5023	(at your option) any later version.
5024		5024
5025	GNU Emacs is distributed in the hope that it will be useful,	5025	GNU Emacs is distributed in the hope that it will be useful,
5026	but WITHOUT ANY WARRANTY; without even the implied warranty of	5026	but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -5028,8 +5028,6 @@
5028	GNU General Public License for more details.	5028	GNU General Public License for more details.
5029		5029
5030	You should have received a copy of the GNU General Public License	5030	You should have received a copy of the GNU General Public License
5031	along with GNU Emacs; see the file COPYING. If not, write to the	5031	along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
5032	Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
5033	Boston, MA 02110-1301, USA.
5034		5032
5035	;; arch-tag: 08b2903e-900c-4c72-a4a9-e76416a80803	5033	;; arch-tag: 08b2903e-900c-4c72-a4a9-e76416a80803


diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 4460b6f596c..8d4e5cae80f 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in
@@ -5,10 +5,10 @@
5		5
6	# This file is part of GNU Emacs.	6	# This file is part of GNU Emacs.
7		7
8	# GNU Emacs is free software; you can redistribute it and/or modify	8	# GNU Emacs is free software: you can redistribute it and/or modify
9	# it under the terms of the GNU General Public License as published by	9	# it under the terms of the GNU General Public License as published by
10	# the Free Software Foundation; either version 3, or (at your option)	10	# the Free Software Foundation, either version 3 of the License, or
11	# any later version.	11	# (at your option) any later version.
12		12
13	# GNU Emacs is distributed in the hope that it will be useful,	13	# GNU Emacs is distributed in the hope that it will be useful,
14	# but WITHOUT ANY WARRANTY; without even the implied warranty of	14	# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@
16	# GNU General Public License for more details.	16	# GNU General Public License for more details.
17		17
18	# You should have received a copy of the GNU General Public License	18	# You should have received a copy of the GNU General Public License
19	# along with GNU Emacs; see the file COPYING. If not, write to	19	# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
20	# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21	# Boston, MA 02110-1301, USA.
22		20
23		21
24	# Where to find the source code. $(srcdir) will be the man-aux	22	# Where to find the source code. $(srcdir) will be the man-aux


diff --git a/doc/misc/gnus-news.el b/doc/misc/gnus-news.el index 5e8999a80dd..aa02c3110e1 100644 --- a/doc/misc/gnus-news.el +++ b/doc/misc/gnus-news.el
@@ -6,10 +6,10 @@
6		6
7	;; This file is part of GNU Emacs.	7	;; This file is part of GNU Emacs.
8		8
9	;; GNU Emacs is free software; you can redistribute it and/or modify	9	;; GNU Emacs is free software: you can redistribute it and/or modify
10	;; it under the terms of the GNU General Public License as published by	10	;; it under the terms of the GNU General Public License as published by
11	;; the Free Software Foundation; either version 3, or (at your option)	11	;; the Free Software Foundation, either version 3 of the License, or
12	;; any later version.	12	;; (at your option) any later version.
13		13
14	;; GNU Emacs is distributed in the hope that it will be useful,	14	;; GNU Emacs is distributed in the hope that it will be useful,
15	;; but WITHOUT ANY WARRANTY; without even the implied warranty of	15	;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +17,7 @@
17	;; GNU General Public License for more details.	17	;; GNU General Public License for more details.
18		18
19	;; You should have received a copy of the GNU General Public License	19	;; You should have received a copy of the GNU General Public License
20	;; along with GNU Emacs; see the file COPYING. If not, write to the	20	;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
21	;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
22	;; Boston, MA 02110-1301, USA.
23		21
24	;;; Commentary:	22	;;; Commentary:
25		23
@@ -43,10 +41,10 @@ For older news, see Gnus info node \"New Features\".\n\n")
43		41
44	This file is part of GNU Emacs.	42	This file is part of GNU Emacs.
45		43
46	GNU Emacs is free software; you can redistribute it and/or modify	44	GNU Emacs is free software: you can redistribute it and/or modify
47	it under the terms of the GNU General Public License as published by	45	it under the terms of the GNU General Public License as published by
48	the Free Software Foundation; either version 3, or (at your option)	46	the Free Software Foundation, either version 3 of the License, or
49	any later version.	47	(at your option) any later version.
50		48
51	GNU Emacs is distributed in the hope that it will be useful,	49	GNU Emacs is distributed in the hope that it will be useful,
52	but WITHOUT ANY WARRANTY; without even the implied warranty of	50	but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -54,9 +52,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
54	GNU General Public License for more details.	52	GNU General Public License for more details.
55		53
56	You should have received a copy of the GNU General Public License	54	You should have received a copy of the GNU General Public License
57	along with GNU Emacs; see the file COPYING. If not, write to the	55	along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
58	Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
59	Boston, MA 02110-1301, USA.
60		56
61	\nLocal variables:\nmode: outline	57	\nLocal variables:\nmode: outline
62	paragraph-separate: \"[ ]*$\"\nend:\n")	58	paragraph-separate: \"[ ]*$\"\nend:\n")
@@ -117,5 +113,5 @@ paragraph-separate: \"[ ]*$\"\nend:\n")
117	(insert gnus-news-trailer)	113	(insert gnus-news-trailer)
118	(write-region (point-min) (point-max) outfile))))	114	(write-region (point-min) (point-max) outfile))))
119		115
120	;;; arch-tag: e23cdd27-eafd-4ba0-816f-98f5edb0dc29	116	;; arch-tag: e23cdd27-eafd-4ba0-816f-98f5edb0dc29
121	;;; gnus-news.el ends here	117	;;; gnus-news.el ends here


diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in index 5af65f1d3ee..668debc9f89 100644 --- a/doc/misc/makefile.w32-in +++ b/doc/misc/makefile.w32-in
@@ -1,13 +1,14 @@
1	#### -- Makefile -- for documentation other than the Emacs manual.	1	#### -- Makefile -- for documentation other than the Emacs manual.
2		2
3	# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.	3	# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
		4	# Free Software Foundation, Inc.
4		5
5	# This file is part of GNU Emacs.	6	# This file is part of GNU Emacs.
6		7
7	# GNU Emacs is free software; you can redistribute it and/or modify	8	# GNU Emacs is free software: you can redistribute it and/or modify
8	# it under the terms of the GNU General Public License as published by	9	# it under the terms of the GNU General Public License as published by
9	# the Free Software Foundation; either version 3, or (at your option)	10	# the Free Software Foundation, either version 3 of the License, or
10	# any later version.	11	# (at your option) any later version.
11		12
12	# GNU Emacs is distributed in the hope that it will be useful,	13	# GNU Emacs is distributed in the hope that it will be useful,
13	# but WITHOUT ANY WARRANTY; without even the implied warranty of	14	# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,8 @@
15	# GNU General Public License for more details.	16	# GNU General Public License for more details.
16		17
17	# You should have received a copy of the GNU General Public License	18	# You should have received a copy of the GNU General Public License
18	# along with GNU Emacs; see the file COPYING. If not, write to	19	# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
19	# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	20
20	# Boston, MA 02110-1301, USA.
21		21
22	# Where to find the source code. The source code for Emacs's C kernel is	22	# Where to find the source code. The source code for Emacs's C kernel is
23	# expected to be in $(srcdir)/src, and the source code for Emacs's	23	# expected to be in $(srcdir)/src, and the source code for Emacs's


diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index 2946574c408..8d6803f20ec 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi
@@ -9652,19 +9652,18 @@ the ``copyright'' line and a pointer to where the full notice is found.
9652	@var{one line to give the program's name and an idea of what it does.}	9652	@var{one line to give the program's name and an idea of what it does.}
9653	Copyright (C) @var{yyyy} @var{name of author}	9653	Copyright (C) @var{yyyy} @var{name of author}
9654		9654
9655	This program is free software; you can redistribute it and/or	9655	This program is free software: you can redistribute it and/or modify
9656	modify it under the terms of the GNU General Public License	9656	it under the terms of the GNU General Public License as published by
9657	as published by the Free Software Foundation; either version 3	9657	the Free Software Foundation, either version 3 of the License, or
9658	of the License, or (at your option) any later version.	9658	(at your option) any later version.
9659		9659
9660	This program is distributed in the hope that it will be useful,	9660	This program is distributed in the hope that it will be useful,
9661	but WITHOUT ANY WARRANTY; without even the implied warranty of	9661	but WITHOUT ANY WARRANTY; without even the implied warranty of
9662	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE@. See the	9662	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9663	GNU General Public License for more details.	9663	GNU General Public License for more details.
9664		9664
9665	You should have received a copy of the GNU General Public License along	9665	You should have received a copy of the GNU General Public License
9666	with this program; if not, write to the Free Software Foundation, Inc.,	9666	along with this program. If not, see <http://www.gnu.org/licenses/>.
9667	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
9668	@end smallexample	9667	@end smallexample
9669		9668
9670	Also add information on how to contact you by electronic and paper mail.	9669	Also add information on how to contact you by electronic and paper mail.