Commit d3fb0974 authored by Glenn Morris's avatar Glenn Morris

Switch to recommended form of GPLv3 permissions notice.

parent 3d544458
...@@ -1846,10 +1846,10 @@ ...@@ -1846,10 +1846,10 @@
This file is part of GNU Emacs. 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option) the Free Software Foundation, either version 3 of the License, or
any later version. (at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful, GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
...@@ -1857,8 +1857,6 @@ ...@@ -1857,8 +1857,6 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
;;; arch-tag: 4b364045-a476-4ff7-92ad-dde58dbd45b4 ;;; arch-tag: 4b364045-a476-4ff7-92ad-dde58dbd45b4
...@@ -9,20 +9,19 @@ ...@@ -9,20 +9,19 @@
# This file is part of GNU Emacs. # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option) # the Free Software Foundation, either version 3 of the License, or
# any later version. # (at your option) any later version.
#
# GNU Emacs is distributed in the hope that it will be useful, # GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # 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. # GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License # 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 # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
# Avoid trouble on systems where the `SHELL' variable might be # Avoid trouble on systems where the `SHELL' variable might be
# inherited from the environment. # inherited from the environment.
......
...@@ -43,10 +43,10 @@ rather long time to generate it. ...@@ -43,10 +43,10 @@ rather long time to generate it.
This file is part of GNU Emacs. 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option) the Free Software Foundation, either version 3 of the License, or
any later version. (at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful, GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
...@@ -54,6 +54,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ...@@ -54,6 +54,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License 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 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
;; This file is part of GNU Emacs. ;; 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 ;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 3, or (at your option) ;; the Free Software Foundation, either version 3 of the License, or
;; any later version. ;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful, ;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
...@@ -19,9 +19,7 @@ ...@@ -19,9 +19,7 @@
;; GNU General Public License for more details. ;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License ;; 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 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
;; Boston, MA 02110-1301, USA.
;;; Commentary: ;;; Commentary:
......
...@@ -8,20 +8,19 @@ ...@@ -8,20 +8,19 @@
# This file is part of GNU Emacs. # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option) # the Free Software Foundation, either version 3 of the License, or
# any later version. # (at your option) any later version.
#
# GNU Emacs is distributed in the hope that it will be useful, # GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # 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. # GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License # 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 # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
srcdir=. srcdir=.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment