From d3fb097470583e6cc6283e9c102f8f1230253db8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 7 May 2008 03:41:32 +0000 Subject: [PATCH] Switch to recommended form of GPLv3 permissions notice. --- leim/ChangeLog | 10 ++++------ leim/Makefile.in | 15 +++++++-------- leim/README | 10 ++++------ leim/leim-ext.el | 10 ++++------ leim/makefile.w32-in | 15 +++++++-------- 5 files changed, 26 insertions(+), 34 deletions(-) diff --git a/leim/ChangeLog b/leim/ChangeLog index d9db47ae3e3..f8a2b1bef2e 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1846,10 +1846,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 @@ -1857,8 +1857,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: 4b364045-a476-4ff7-92ad-dde58dbd45b4 diff --git a/leim/Makefile.in b/leim/Makefile.in index b67b700f9e9..2ce3503e6ee 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -9,20 +9,19 @@ # 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 . + # Avoid trouble on systems where the `SHELL' variable might be # inherited from the environment. diff --git a/leim/README b/leim/README index c4d242cbb20..1c0eaf063fa 100644 --- a/leim/README +++ b/leim/README @@ -43,10 +43,10 @@ rather long time to generate it. 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,6 +54,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/leim/leim-ext.el b/leim/leim-ext.el index cd20c56c2d7..b6e7323cba9 100644 --- a/leim/leim-ext.el +++ b/leim/leim-ext.el @@ -8,10 +8,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 @@ -19,9 +19,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: diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in index 00603fee62b..d28da9da433 100644 --- a/leim/makefile.w32-in +++ b/leim/makefile.w32-in @@ -8,20 +8,19 @@ # 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 . + srcdir=. -- 2.39.5