From: Glenn Morris Date: Fri, 16 May 2008 05:22:47 +0000 (+0000) Subject: Switch to recommended form of GPLv3 permissions notice. X-Git-Tag: emacs-pretest-23.0.90~5489 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97c0352c515bc9501132e52b506aa58f2211c2c2;p=emacs.git Switch to recommended form of GPLv3 permissions notice. --- 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) - 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 @@ -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 - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + along with GNU Emacs. If not, see . ;; 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) -.\" 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 +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 -.\" Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -.\" Boston, MA 02110-1301, USA. +.\" along with GNU Emacs. If not, see . .\" '\" 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) - 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 . ;; 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) -# 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 . # 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) -;; 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 . ;;; 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) -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 @@ 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 . \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) -# 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 . + # 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 -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 . @end smallexample Also add information on how to contact you by electronic and paper mail.