From 352c8b4a9b52d7ebfea8582db1040a9aaf1d7c42 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 16 May 2008 06:02:53 +0000 Subject: [PATCH] Switch to recommended form of GPLv3 permissions notice. --- doc/emacs/ChangeLog | 14 ++++++-------- doc/emacs/Makefile.in | 11 +++++------ doc/emacs/makefile.w32-in | 11 +++++------ doc/lispref/ChangeLog | 16 +++++++--------- doc/lispref/Makefile.in | 11 +++++------ doc/lispref/README | 10 ++++------ doc/lispref/makefile.w32-in | 11 +++++------ doc/lispref/tindex.pl | 23 +++++++++++------------ doc/lispref/tips.texi | 25 +++++++++++-------------- doc/lispref/two-volume-cross-refs.txt | 10 ++++------ doc/lispref/two-volume.make | 10 ++++------ doc/lispref/two.el | 14 +++++++------- 12 files changed, 74 insertions(+), 92 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 1d5328a606b..54528646c7c 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,8 +1,8 @@ 2008-05-15 Eric S. Raymond * 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 @@ -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 . ;;; arch-tag: f1d62776-3ed5-4811-9d96-267252577dbd diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 4527c3c767f..230496ed006 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/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) -# 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 . + # Where to find the source code. $(srcdir) will be the man # subdirectory of the source tree. This is diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in index 99b9e173f65..4b80cd18fd5 100644 --- a/doc/emacs/makefile.w32-in +++ b/doc/emacs/makefile.w32-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) -# 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 . + # 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/lispref/ChangeLog b/doc/lispref/ChangeLog index 2214ee0afa6..308cb386aa6 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,6 +1,6 @@ 2008-05-03 Eric S. Raymond - * keymaps.texi: Clarify that (current-local-map) and + * keymaps.texi: Clarify that (current-local-map) and (current-global-map) return references, not copies. 2008-05-02 Juri Linkov @@ -6592,15 +6592,15 @@ ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002, 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) - 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 @@ -6608,8 +6608,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 . ;;; arch-tag: 985ae0ce-df29-475b-b3f8-4bbcbf6f7fda diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index 04464c5c680..54fc32f217a 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -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) -# 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 @@ -17,9 +17,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 . + # Standard configure variables. srcdir = @srcdir@ diff --git a/doc/lispref/README b/doc/lispref/README index b110c8feda0..18ee5af9505 100644 --- a/doc/lispref/README +++ b/doc/lispref/README @@ -56,10 +56,10 @@ with `make-permuted-index'. 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 @@ -67,6 +67,4 @@ 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 -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. +along with GNU Emacs. If not, see . diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in index 381d389cae3..1fd84631e0f 100644 --- a/doc/lispref/makefile.w32-in +++ b/doc/lispref/makefile.w32-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) -# 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 . + # Standard configure variables. srcdir = . diff --git a/doc/lispref/tindex.pl b/doc/lispref/tindex.pl index 83a1df94d1a..6bd59d59aca 100755 --- a/doc/lispref/tindex.pl +++ b/doc/lispref/tindex.pl @@ -1,24 +1,23 @@ #! /usr/bin/perl -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. -# +# Copyright (C) 2000, 2001, 2002, 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) -# 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 # 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 -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# along with GNU Emacs. If not, see . + require 5; use Getopt::Long; diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index e8023edcd5d..e219a1e3d49 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -272,20 +272,18 @@ file if you distribute copies. Use a notice like this one: @smallexample ;; Copyright (C) @var{year} @var{name} -;; 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 3 of -;; the License, or (at your option) any later version. +;; 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 3 of the License, or +;; (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 GNU General Public License for more details. +;; 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 +;; GNU General Public License for more details. -;; You should have received a copy of the GNU General Public -;; License along with this program; if not, write to the Free -;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301 USA +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . @end smallexample If you have signed papers to assign the copyright to the Foundation, @@ -1016,8 +1014,7 @@ if we haven't installed it in Emacs yet! ;; This file is part of GNU Emacs. @dots{} -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . @end group @end smallexample diff --git a/doc/lispref/two-volume-cross-refs.txt b/doc/lispref/two-volume-cross-refs.txt index f77aff098b8..40dcbeee063 100644 --- a/doc/lispref/two-volume-cross-refs.txt +++ b/doc/lispref/two-volume-cross-refs.txt @@ -306,10 +306,10 @@ another run! COPYING CONDITIONS -This file is free software; you can redistribute it and/or modify +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 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. This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -317,6 +317,4 @@ 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 this file; 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 this file. If not, see . diff --git a/doc/lispref/two-volume.make b/doc/lispref/two-volume.make index bf245570134..4fcfe9039df 100644 --- a/doc/lispref/two-volume.make +++ b/doc/lispref/two-volume.make @@ -209,10 +209,10 @@ elisp2-init: vol2.texi # COPYING CONDITIONS # -# This file is free software; you can redistribute it and/or modify +# 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 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. # # This file is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -220,8 +220,6 @@ elisp2-init: vol2.texi # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this file; 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 this file. If not, see . # arch-tag: 5c258a2e-d4a9-4d0e-b279-fb3a6faa27eb diff --git a/doc/lispref/two.el b/doc/lispref/two.el index 388ceedde5b..21a8c5895ef 100644 --- a/doc/lispref/two.el +++ b/doc/lispref/two.el @@ -5,10 +5,10 @@ ;; --rjc 30mar92 -;; This file is free software; you can redistribute it and/or modify +;; 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 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. ;; This file 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 this file; 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 this file. If not, see . + (defun volume-aux-markup (arg) "Append `vol. NUMBER' to page number. @@ -77,4 +76,5 @@ This is for the *Elisp Ref Manual*" (defun volume-numbers-toc-markup-I () (volume-numbers-toc-markup "I")) (defun volume-numbers-toc-markup-II () (volume-numbers-toc-markup "II")) -;;; arch-tag: 848955fe-e9cf-45e7-a2f1-570ef156d6a5 +;; arch-tag: 848955fe-e9cf-45e7-a2f1-570ef156d6a5 +;;; two.el ends here