Mercurial > emacs

changeset 95036:76cbdd481eaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch to recommended form of GPLv3 permissions notice.
author Glenn Morris <rgm@gnu.org>
date Fri, 16 May 2008 06:02:53 +0000
parents fde6f792a832
children aace8f4875d2
files doc/emacs/ChangeLog doc/emacs/Makefile.in doc/emacs/makefile.w32-in
diffstat 3 files changed, 16 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/doc/emacs/ChangeLog	Fri May 16 06:00:30 2008 +0000
+++ b/doc/emacs/ChangeLog	Fri May 16 06:02:53 2008 +0000
@@ -1,8 +1,8 @@
 2008-05-15  Eric S. Raymond  <esr@snark.thyrsus.com>
 
 	* vc2-xtra.texi, emacs.texi, files.texi: Snapshots node renamed to
-	Revision Tags and rewritten. Section now uses modern terminology
-	(tags rather than snapshots) and describes post-SCCS systems more 
+	Revision Tags and rewritten.  Section now uses modern terminology,
+	(tags rather than snapshots) and describes post-SCCS systems more
 	accurately.
 
 2008-05-10  Eli Zaretskii  <eliz@gnu.org>
@@ -5302,10 +5302,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)
-  any later version.
+  the Free Software Foundation, either version 3 of the License, or
+  (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
@@ -5313,8 +5313,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
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; arch-tag: f1d62776-3ed5-4811-9d96-267252577dbd
--- a/doc/emacs/Makefile.in	Fri May 16 06:00:30 2008 +0000
+++ b/doc/emacs/Makefile.in	Fri May 16 06:02:53 2008 +0000
@@ -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)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or
+# (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,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
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 
 # Where to find the source code.  $(srcdir) will be the man
 # subdirectory of the source tree.  This is
--- a/doc/emacs/makefile.w32-in	Fri May 16 06:00:30 2008 +0000
+++ b/doc/emacs/makefile.w32-in	Fri May 16 06:02:53 2008 +0000
@@ -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)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or
+# (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,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
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 
 # 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