From 8ae3715e3e98cf0e263d60eb3047ed9973d82299 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 16 May 2008 05:49:14 +0000 Subject: [PATCH] Switch to recommended form of GPLv3 permissions notice. --- doc/lispintro/ChangeLog | 14 ++++++-------- doc/lispintro/Makefile.in | 11 +++++------ doc/lispintro/README | 10 ++++------ doc/lispintro/cons-1.eps | 10 ++++------ doc/lispintro/cons-2.eps | 10 ++++------ doc/lispintro/cons-2a.eps | 10 ++++------ doc/lispintro/cons-3.eps | 10 ++++------ doc/lispintro/cons-4.eps | 10 ++++------ doc/lispintro/cons-5.eps | 10 ++++------ doc/lispintro/drawers.eps | 10 ++++------ doc/lispintro/lambda-1.eps | 10 ++++------ doc/lispintro/lambda-2.eps | 10 ++++------ doc/lispintro/lambda-3.eps | 10 ++++------ doc/lispintro/makefile.w32-in | 14 +++++++------- 14 files changed, 62 insertions(+), 87 deletions(-) diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index d9e6167749..efec0dbe88 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -273,15 +273,15 @@ ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 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 @@ -289,8 +289,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: ee4f8e1f-e14c-4d2e-86de-4dd697e6f1c3 diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index 1ce6a55811..8511750bd7 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/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,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 . + SHELL = @SHELL@ diff --git a/doc/lispintro/README b/doc/lispintro/README index b6a8528448..42c1b69e20 100644 --- a/doc/lispintro/README +++ b/doc/lispintro/README @@ -68,10 +68,10 @@ Robert J. Chassell, bob@gnu.org 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 @@ -79,6 +79,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/doc/lispintro/cons-1.eps b/doc/lispintro/cons-1.eps index eb144dfba2..55af9e329e 100644 --- a/doc/lispintro/cons-1.eps +++ b/doc/lispintro/cons-1.eps @@ -12,10 +12,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 @@ -23,9 +23,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 . /tgifdict 132 dict def tgifdict begin diff --git a/doc/lispintro/cons-2.eps b/doc/lispintro/cons-2.eps index 1f93b4afb1..c59e3d46e7 100644 --- a/doc/lispintro/cons-2.eps +++ b/doc/lispintro/cons-2.eps @@ -12,10 +12,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 @@ -23,9 +23,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 . /tgifdict 132 dict def tgifdict begin diff --git a/doc/lispintro/cons-2a.eps b/doc/lispintro/cons-2a.eps index 0c1df6805a..2bccee015d 100644 --- a/doc/lispintro/cons-2a.eps +++ b/doc/lispintro/cons-2a.eps @@ -12,10 +12,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 @@ -23,9 +23,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 . /tgifdict 132 dict def tgifdict begin diff --git a/doc/lispintro/cons-3.eps b/doc/lispintro/cons-3.eps index c469c46371..1ed450febe 100644 --- a/doc/lispintro/cons-3.eps +++ b/doc/lispintro/cons-3.eps @@ -12,10 +12,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 @@ -23,9 +23,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 . /tgifdict 132 dict def tgifdict begin diff --git a/doc/lispintro/cons-4.eps b/doc/lispintro/cons-4.eps index a743337216..a77a1d274c 100644 --- a/doc/lispintro/cons-4.eps +++ b/doc/lispintro/cons-4.eps @@ -12,10 +12,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 @@ -23,9 +23,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 . /tgifdict 132 dict def tgifdict begin diff --git a/doc/lispintro/cons-5.eps b/doc/lispintro/cons-5.eps index 26ee898134..6e3f8be6ac 100644 --- a/doc/lispintro/cons-5.eps +++ b/doc/lispintro/cons-5.eps @@ -12,10 +12,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 @@ -23,9 +23,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 . /tgifdict 132 dict def tgifdict begin diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps index 72f6adecf6..ae8624e648 100644 --- a/doc/lispintro/drawers.eps +++ b/doc/lispintro/drawers.eps @@ -14,10 +14,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 @@ -25,9 +25,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 . /tgifdict 53 dict def tgifdict begin diff --git a/doc/lispintro/lambda-1.eps b/doc/lispintro/lambda-1.eps index 55a50ab7d0..b20623bf58 100644 --- a/doc/lispintro/lambda-1.eps +++ b/doc/lispintro/lambda-1.eps @@ -12,10 +12,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 @@ -23,9 +23,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 . /tgifdict 132 dict def tgifdict begin diff --git a/doc/lispintro/lambda-2.eps b/doc/lispintro/lambda-2.eps index 76990074e9..7d18059bcf 100644 --- a/doc/lispintro/lambda-2.eps +++ b/doc/lispintro/lambda-2.eps @@ -12,10 +12,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 @@ -23,9 +23,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 . /tgifdict 132 dict def tgifdict begin diff --git a/doc/lispintro/lambda-3.eps b/doc/lispintro/lambda-3.eps index 1e7dd130d6..9848b43195 100644 --- a/doc/lispintro/lambda-3.eps +++ b/doc/lispintro/lambda-3.eps @@ -12,10 +12,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 @@ -23,9 +23,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 . /tgifdict 132 dict def tgifdict begin diff --git a/doc/lispintro/makefile.w32-in b/doc/lispintro/makefile.w32-in index 8d22c821ac..827cb37c39 100644 --- a/doc/lispintro/makefile.w32-in +++ b/doc/lispintro/makefile.w32-in @@ -1,13 +1,14 @@ #### -*- Makefile -*- for the Emacs Lisp Introduction 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 . + srcdir = . -- 2.39.2