summaryrefslogtreecommitdiff
path: root/lispref
diff options
context:
space:
mode:
Diffstat (limited to 'lispref')
-rw-r--r--lispref/ChangeLog8
-rw-r--r--lispref/Makefile.in2
-rw-r--r--lispref/README2
-rw-r--r--lispref/makefile.w32-in2
-rwxr-xr-xlispref/tindex.pl2
-rw-r--r--lispref/tips.texi2
-rw-r--r--lispref/two-volume-cross-refs.txt2
-rw-r--r--lispref/two-volume.make2
-rw-r--r--lispref/two.el2
-rw-r--r--lispref/vol1.texi3
-rw-r--r--lispref/vol2.texi3
11 files changed, 17 insertions, 13 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index d878bc52337..cf110147ad8 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-25 Glenn Morris <rgm@gnu.org>
+
+ * gpl.texi (GPL): Replace license with GPLv3.
+
+ * Relicense all FSF files to GPLv3 or later.
+
2007-07-24 Michael Albinus <michael.albinus@gmx.de>
* processes.texi (Synchronous Processes): Add
@@ -6213,7 +6219,7 @@ Tue Apr 11 12:23:28 1989 Robert J. Chassell (bob@rice-chex.ai.mit.edu)
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 2, or (at your option)
+ the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispref/Makefile.in b/lispref/Makefile.in
index 9abd45f8f15..1a34d60a0d8 100644
--- a/lispref/Makefile.in
+++ b/lispref/Makefile.in
@@ -7,7 +7,7 @@
# 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 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispref/README b/lispref/README
index 564c349256e..c5d4c8acc77 100644
--- a/lispref/README
+++ b/lispref/README
@@ -58,7 +58,7 @@ This file is part of GNU Emacs.
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 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in
index dc312691dab..7e35339d17f 100644
--- a/lispref/makefile.w32-in
+++ b/lispref/makefile.w32-in
@@ -6,7 +6,7 @@
# 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 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispref/tindex.pl b/lispref/tindex.pl
index 73143ffa596..89bbe5f5f6f 100755
--- a/lispref/tindex.pl
+++ b/lispref/tindex.pl
@@ -7,7 +7,7 @@
#
# 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 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
# GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lispref/tips.texi b/lispref/tips.texi
index 254e1faf7ff..de590c4cf9d 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -274,7 +274,7 @@ file if you distribute copies. Use a notice like this one:
;; This program 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 2 of
+;; published by the Free Software Foundation; either version 3 of
;; the License, or (at your option) any later version.
;; This program is distributed in the hope that it will be
diff --git a/lispref/two-volume-cross-refs.txt b/lispref/two-volume-cross-refs.txt
index 1e923cab8e6..6e40920cf66 100644
--- a/lispref/two-volume-cross-refs.txt
+++ b/lispref/two-volume-cross-refs.txt
@@ -308,7 +308,7 @@ COPYING CONDITIONS
This file 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 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
This file is distributed in the hope that it will be useful,
diff --git a/lispref/two-volume.make b/lispref/two-volume.make
index 5b531ab87a5..b2550576825 100644
--- a/lispref/two-volume.make
+++ b/lispref/two-volume.make
@@ -211,7 +211,7 @@ elisp2-init: vol2.texi
#
# This file 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 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
# This file is distributed in the hope that it will be useful,
diff --git a/lispref/two.el b/lispref/two.el
index 5f8fca8c54b..baade844463 100644
--- a/lispref/two.el
+++ b/lispref/two.el
@@ -7,7 +7,7 @@
;; This file 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 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
;; any later version.
;; This file is distributed in the hope that it will be useful,
diff --git a/lispref/vol1.texi b/lispref/vol1.texi
index d0989f6c58e..d41b2f076df 100644
--- a/lispref/vol1.texi
+++ b/lispref/vol1.texi
@@ -26,7 +26,7 @@
@c Version of the manual and of Emacs.
@c Please remember to update the edition number in README as well.
@set VERSION 2.9
-@set EMACSVER 22.0.99
+@set EMACSVER 22
@dircategory Emacs
@direntry
@@ -48,7 +48,6 @@
@tex
@ifset smallbook
@fonttextsize 10
-@set EMACSVER 22
\global\let\urlcolor=\Black % don't print links in grayscale
\global\let\linkcolor=\Black
@end ifset
diff --git a/lispref/vol2.texi b/lispref/vol2.texi
index 35ffa0e88b2..515973c6281 100644
--- a/lispref/vol2.texi
+++ b/lispref/vol2.texi
@@ -26,7 +26,7 @@
@c Version of the manual and of Emacs.
@c Please remember to update the edition number in README as well.
@set VERSION 2.9
-@set EMACSVER 22.0.99
+@set EMACSVER 22
@dircategory Emacs
@direntry
@@ -48,7 +48,6 @@
@tex
@ifset smallbook
@fonttextsize 10
-@set EMACSVER 22
\global\let\urlcolor=\Black % don't print links in grayscale
\global\let\linkcolor=\Black
@end ifset