Mercurial > emacs
changeset 95032:fbe58782bc21
Switch to recommended form of GPLv3 permissions notice.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 16 May 2008 05:21:48 +0000 |
| parents | cd54e612f34f |
| children | dcdb16dd1b69 |
| files | doc/misc/ChangeLog doc/misc/Makefile.in doc/misc/gnus-news.el doc/misc/makefile.w32-in doc/misc/mh-e.texi |
| diffstat | 5 files changed, 31 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/ChangeLog Fri May 16 04:55:56 2008 +0000 +++ b/doc/misc/ChangeLog Fri May 16 05:21:48 2008 +0000 @@ -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) - 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 @@ -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 - 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: 08b2903e-900c-4c72-a4a9-e76416a80803
--- a/doc/misc/Makefile.in Fri May 16 04:55:56 2008 +0000 +++ b/doc/misc/Makefile.in Fri May 16 05:21:48 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,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 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-aux
--- a/doc/misc/gnus-news.el Fri May 16 04:55:56 2008 +0000 +++ b/doc/misc/gnus-news.el Fri May 16 05:21:48 2008 +0000 @@ -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,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 -;; 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/>. ;;; Commentary: @@ -43,10 +41,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 @@ -54,9 +52,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 -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/>. \nLocal variables:\nmode: outline paragraph-separate: \"[ ]*$\"\nend:\n") @@ -117,5 +113,5 @@ (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
--- a/doc/misc/makefile.w32-in Fri May 16 04:55:56 2008 +0000 +++ b/doc/misc/makefile.w32-in Fri May 16 05:21:48 2008 +0000 @@ -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) -# 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 @@ -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 -# 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
--- a/doc/misc/mh-e.texi Fri May 16 04:55:56 2008 +0000 +++ b/doc/misc/mh-e.texi Fri May 16 05:21:48 2008 +0000 @@ -9652,19 +9652,18 @@ @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 -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 +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 <http://www.gnu.org/licenses/>. @end smallexample Also add information on how to contact you by electronic and paper mail.