From ab73e885f0ba6e26fd4389e0e4935c0bbe821c0c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 15 May 2008 07:32:14 +0000 Subject: [PATCH] Switch to recommended form of GPLv3 permissions notice. --- etc/CONTRIBUTE | 10 ++++------ etc/ChangeLog | 10 ++++------ etc/DEBUG | 10 ++++------ etc/DISTRIB | 10 ++++------ etc/ERC-NEWS | 10 ++++------ etc/ETAGS.EBNF | 10 ++++------ etc/ETAGS.README | 10 ++++------ etc/GNUS-NEWS | 10 ++++------ etc/HELLO | 10 ++++------ etc/MACHINES | 10 ++++------ etc/MH-E-NEWS | 10 ++++------ etc/MORE.STUFF | 10 ++++------ etc/NEWS | 10 ++++------ etc/NEWS.1-17 | 10 ++++------ etc/NEWS.18 | 10 ++++------ etc/NEWS.19 | 10 ++++------ etc/NEWS.20 | 10 ++++------ etc/NEWS.21 | 10 ++++------ etc/NEWS.22 | 10 ++++------ etc/PROBLEMS | 10 ++++------ etc/TERMS | 10 ++++------ etc/TODO | 10 ++++------ etc/charsets/README | 11 ++++------- etc/compilation.txt | 10 ++++------ etc/edt-user.doc | 29 ++++++++++++++--------------- etc/emacs-buffer.gdb | 16 +++++++--------- etc/emacs.bash | 10 ++++------ etc/emacs2.py | 10 ++++------ etc/emacs3.py | 10 ++++------ etc/enriched.doc | 10 ++++------ etc/gnus-tut.txt | 14 ++++++-------- etc/grep.txt | 10 ++++------ etc/images/splash.xpm | 10 ++++------ etc/images/splash8.xpm | 10 ++++------ etc/ps-prin0.ps | 18 ++++++++---------- etc/ps-prin1.ps | 18 ++++++++---------- etc/ses-example.ses | 10 ++++------ etc/tutorials/TUTORIAL | 20 +++++++++----------- 38 files changed, 180 insertions(+), 256 deletions(-) diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE index 07165a98de..aea7e07633 100644 --- a/etc/CONTRIBUTE +++ b/etc/CONTRIBUTE @@ -185,10 +185,10 @@ The file etc/DEBUG describes how to debug Emacs bugs. 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 @@ -196,9 +196,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 . Local variables: mode: outline diff --git a/etc/ChangeLog b/etc/ChangeLog index f1320f1763..96a4ff3391 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -4256,10 +4256,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 @@ -4267,8 +4267,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: 094f3a51-bd72-44d0-8fac-2ac242c6c5b1 diff --git a/etc/DEBUG b/etc/DEBUG index bca9b6ac4f..eaa8ca6f20 100644 --- a/etc/DEBUG +++ b/etc/DEBUG @@ -746,10 +746,10 @@ of these variables. 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 @@ -757,9 +757,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 . Local variables: diff --git a/etc/DISTRIB b/etc/DISTRIB index 0e1c91f038..af200f3a68 100644 --- a/etc/DISTRIB +++ b/etc/DISTRIB @@ -99,10 +99,10 @@ above). 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 @@ -110,6 +110,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/etc/ERC-NEWS b/etc/ERC-NEWS index ec348a450f..2a8f53fb8b 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -1331,10 +1331,10 @@ the rest should be automatic. 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 @@ -1342,8 +1342,6 @@ 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 . arch-tag: 2b21b387-6cdc-4192-889c-6743cfffdcb1 diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF index 9f69a7492b..fa2ae6c772 100644 --- a/etc/ETAGS.EBNF +++ b/etc/ETAGS.EBNF @@ -99,10 +99,10 @@ Free Software Foundation, Inc. COPYING PERMISSIONS: - This document is free software; you can redistribute it and/or modify + This document 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 program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -110,6 +110,4 @@ COPYING PERMISSIONS: GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA. + along with this program. If not, see . diff --git a/etc/ETAGS.README b/etc/ETAGS.README index ed3aa2fe16..1f51cfec0e 100644 --- a/etc/ETAGS.README +++ b/etc/ETAGS.README @@ -34,10 +34,10 @@ Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999, This file is not considered part of GNU Emacs. -This program is free software; you can redistribute it and/or modify +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, 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 program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -45,6 +45,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 program; 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 program. If not, see . diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS index 243d14fd80..c1f59477c8 100644 --- a/etc/GNUS-NEWS +++ b/etc/GNUS-NEWS @@ -257,10 +257,10 @@ will connect to the news host by way of the intermediate host 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 @@ -268,9 +268,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 . Local variables: diff --git a/etc/HELLO b/etc/HELLO index 2e651a5144..e1cd78187c 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -76,10 +76,10 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 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 @@ -87,9 +87,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 . ;;; Local Variables: ;;; tab-width: 32 diff --git a/etc/MACHINES b/etc/MACHINES index 0e55fa76ea..f2b9a36bc0 100644 --- a/etc/MACHINES +++ b/etc/MACHINES @@ -1023,10 +1023,10 @@ End: 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 @@ -1034,8 +1034,6 @@ 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 . arch-tag: 7d2e93c7-e982-40ec-9055-3cd064042473 diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS index a5a400427e..72fc15b4ff 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS @@ -3120,10 +3120,10 @@ doesn't find `in-reply-to:'. 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 @@ -3131,9 +3131,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 . Local variables: diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF index 3caae580a5..2613336b92 100644 --- a/etc/MORE.STUFF +++ b/etc/MORE.STUFF @@ -275,10 +275,10 @@ End: 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 @@ -286,8 +286,6 @@ 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 . arch-tag: c1d4e7c8-db85-44e6-909e-659e2b20fefa diff --git a/etc/NEWS b/etc/NEWS index a042bcf9c9..528337dc2e 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1154,10 +1154,10 @@ to get the next buffer to search in the series of multiple buffers. ---------------------------------------------------------------------- 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 @@ -1165,9 +1165,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 . Local variables: diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 21f4c34080..c92cee7481 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 @@ -2513,10 +2513,10 @@ Lisp programming changes ---------------------------------------------------------------------- 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 @@ -2524,9 +2524,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 . Local variables: diff --git a/etc/NEWS.18 b/etc/NEWS.18 index d0c67c5ec5..ba8d5414d7 100644 --- a/etc/NEWS.18 +++ b/etc/NEWS.18 @@ -1603,10 +1603,10 @@ C_SWITCH_MACHINE can be defined by the m- file to specify extra `cc' switches. ---------------------------------------------------------------------- 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 @@ -1614,9 +1614,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 . Local variables: diff --git a/etc/NEWS.19 b/etc/NEWS.19 index 2284e8e6a3..5976a836d2 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 @@ -6523,10 +6523,10 @@ the tar file. ---------------------------------------------------------------------- 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 @@ -6534,9 +6534,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 . Local variables: diff --git a/etc/NEWS.20 b/etc/NEWS.20 index 86ce7d9700..c4cd9e1466 100644 --- a/etc/NEWS.20 +++ b/etc/NEWS.20 @@ -4496,10 +4496,10 @@ select one of those items. ---------------------------------------------------------------------- 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 @@ -4507,9 +4507,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 . Local variables: diff --git a/etc/NEWS.21 b/etc/NEWS.21 index e9b2b96c31..95340fcbc3 100644 --- a/etc/NEWS.21 +++ b/etc/NEWS.21 @@ -4883,10 +4883,10 @@ support a vertical-bar cursor). ---------------------------------------------------------------------- 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 @@ -4894,9 +4894,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 . Local variables: diff --git a/etc/NEWS.22 b/etc/NEWS.22 index 153fbf4620..6bd1393d1b 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 @@ -5563,10 +5563,10 @@ an error if the argument actually returns differing values. ---------------------------------------------------------------------- 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 @@ -5574,9 +5574,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 . Local variables: diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 15217e3a05..ec96b19f2b 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -3772,10 +3772,10 @@ of machine defines NO_UNION_TYPE. 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 @@ -3783,9 +3783,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 . Local variables: diff --git a/etc/TERMS b/etc/TERMS index 5a06a826d1..b0822c4818 100644 --- a/etc/TERMS +++ b/etc/TERMS @@ -235,10 +235,10 @@ AT386-UL|at386-ul|386AT-UL|386at-ul|at/386 console, COPYING PERMISSIONS: - This document is free software; you can redistribute it and/or modify + This document 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 program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -246,6 +246,4 @@ COPYING PERMISSIONS: GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA. + along with this program. If not, see . diff --git a/etc/TODO b/etc/TODO index 058bd6a581..a01ed840db 100644 --- a/etc/TODO +++ b/etc/TODO @@ -695,10 +695,10 @@ not be noticed if it appears within a word. 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 @@ -706,8 +706,6 @@ 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 . ;;; arch-tag: b0a3e40b-726a-457d-9999-ba848321b036 diff --git a/etc/charsets/README b/etc/charsets/README index 68dc94d106..e72425a4d7 100644 --- a/etc/charsets/README +++ b/etc/charsets/README @@ -7,10 +7,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 @@ -18,10 +18,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 . (1) Format of mapping files diff --git a/etc/compilation.txt b/etc/compilation.txt index 9499007499..aacc115203 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt @@ -451,10 +451,10 @@ Free Software Foundation, Inc. COPYING PERMISSIONS: - This document is free software; you can redistribute it and/or modify + This document 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 program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -462,6 +462,4 @@ COPYING PERMISSIONS: GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA. + along with this program. If not, see . diff --git a/etc/edt-user.doc b/etc/edt-user.doc index 2403bd3e5b..bdcd39a7ec 100644 --- a/etc/edt-user.doc +++ b/etc/edt-user.doc @@ -11,17 +11,18 @@ Keywords: emulations This file is part of GNU Emacs. -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. +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 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. +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. +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . ============================================================================ @@ -830,10 +831,10 @@ G-C-\: Split Window | FNDNXT | Yank | CUT | ;; Maintainer: Kevin Gallagher ;; Keywords: emulations -;; 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 @@ -841,9 +842,7 @@ G-C-\: Split Window | FNDNXT | Yank | CUT | ;; 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/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb index cb64005e14..cf2766d4e2 100644 --- a/etc/emacs-buffer.gdb +++ b/etc/emacs-buffer.gdb @@ -10,21 +10,19 @@ # Created: 2005-04-28 # 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 . # Commentary: diff --git a/etc/emacs.bash b/etc/emacs.bash index 82e487c16f..831fb7e1d7 100644 --- a/etc/emacs.bash +++ b/etc/emacs.bash @@ -7,10 +7,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 @@ -18,9 +18,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/etc/emacs2.py b/etc/emacs2.py index 7f0e44e3af..223742b6a9 100644 --- a/etc/emacs2.py +++ b/etc/emacs2.py @@ -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 . import os, sys, traceback, inspect, __main__ diff --git a/etc/emacs3.py b/etc/emacs3.py index 7160eb27a8..bf28aeab04 100644 --- a/etc/emacs3.py +++ b/etc/emacs3.py @@ -10,10 +10,10 @@ Warning: This file is automatically generated from emacs2.py with the # 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 @@ -21,9 +21,7 @@ Warning: This file is automatically generated from emacs2.py with 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 . import os, sys, traceback, inspect, __main__ diff --git a/etc/enriched.doc b/etc/enriched.doc index be8f8989a2..0e069fada2 100644 --- a/etc/enriched.doc +++ b/etc/enriched.doc @@ -261,10 +261,10 @@ Free Software Foundation, Inc. COPYING PERMISSIONS: - This document is free software; you can redistribute it and/or modify + This document 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 program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -272,6 +272,4 @@ COPYING PERMISSIONS: GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA. + along with this program. If not, see . diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index 9a8dbfcc96..e3d7da23c5 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt @@ -24,18 +24,18 @@ was done by moi, yours truly, your humble servant, Lars Magne Ingebrigtsen. If you have a WWW browser, you can investigate to your heart's delight at . -;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news ;; 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 @@ -43,9 +43,7 @@ heart's delight at . ;; 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 . From lars Thu Feb 23 23:20:38 1995 From: larsi@ifi.uio.no (ding) diff --git a/etc/grep.txt b/etc/grep.txt index c6765850c1..dc33be2415 100644 --- a/etc/grep.txt +++ b/etc/grep.txt @@ -89,10 +89,10 @@ Free Software Foundation, Inc. COPYING PERMISSIONS: - This document is free software; you can redistribute it and/or modify + This document 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 program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -100,9 +100,7 @@ COPYING PERMISSIONS: GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA. + along with this program. If not, see . ;;; Local Variables: diff --git a/etc/images/splash.xpm b/etc/images/splash.xpm index 64eb931f82..975d0fe0c8 100644 --- a/etc/images/splash.xpm +++ b/etc/images/splash.xpm @@ -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 . */ static char *splash[] = { /* width height num_colors chars_per_pixel */ diff --git a/etc/images/splash8.xpm b/etc/images/splash8.xpm index 2e909ce67a..39b37311f5 100644 --- a/etc/images/splash8.xpm +++ b/etc/images/splash8.xpm @@ -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 . */ static char * splash_xpm[] = { "270 217 4 1", diff --git a/etc/ps-prin0.ps b/etc/ps-prin0.ps index b537be33eb..a08852f4f2 100644 --- a/etc/ps-prin0.ps +++ b/etc/ps-prin0.ps @@ -3,23 +3,21 @@ % 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 . % As a special exception, the copyright holders of this module give % you permission to include the module in a Postscript file generated diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps index 36e0efeb0c..7b04197015 100644 --- a/etc/ps-prin1.ps +++ b/etc/ps-prin1.ps @@ -3,23 +3,21 @@ % 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 . % As a special exception, the copyright holders of this module give % you permission to include the module in a Postscript file generated diff --git a/etc/ses-example.ses b/etc/ses-example.ses index fc3f47fa36..a92377f06b 100644 --- a/etc/ses-example.ses +++ b/etc/ses-example.ses @@ -210,10 +210,10 @@ Sales summary - Acme fundraising ;;; COPYING PERMISSIONS: ;;; -;;; This document is free software; you can redistribute it and/or modify +;;; This document 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 program is distributed in the hope that it will be useful, ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -221,8 +221,6 @@ Sales summary - Acme fundraising ;;; GNU General Public License for more details. ;;; ;;; You should have received a copy of the GNU General Public License -;;; along with this program; see the file COPYING. If not, write to the -;;; Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -;;; Boston, MA 02110-1301, USA. +;;; along with this program. If not, see . ;;; arch-tag: 4fcb0843-e3f9-4270-b8fb-998129190765 diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index 4345ac504e..aba9cadb08 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL @@ -1097,25 +1097,23 @@ starting with the one written by Stuart Cracraft for the original Emacs. This version of the tutorial is a part of GNU Emacs. It is copyrighted and comes with permission to distribute copies on certain conditions: - Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1985, 1996, 1998, 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 . Please read the file COPYING and then do give copies of GNU Emacs to your friends. Help stamp out software obstructionism ("ownership") by -- 2.20.1