From 9ad5de0c1c0222b96134593e0d87ebb80e317201 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 9 May 2008 23:48:10 +0000 Subject: [PATCH] Switch to recommended form of GPLv3 permissions notice. --- admin/ChangeLog | 14 ++++++-------- admin/README | 24 +++++++++++------------- admin/admin.el | 10 ++++------ admin/alloc-colors.c | 11 +++++------ admin/build-configs | 20 +++++++++----------- admin/charsets/Makefile | 12 +++++------- admin/charsets/big5.awk | 18 ++++++++---------- admin/charsets/compact.awk | 20 +++++++++----------- admin/charsets/cp51932.awk | 20 +++++++++----------- admin/charsets/cp932.awk | 21 ++++++++++----------- admin/charsets/eucjp-ms.awk | 20 +++++++++----------- admin/charsets/gb180302.awk | 18 ++++++++---------- admin/charsets/gb180304.awk | 18 ++++++++---------- admin/charsets/mapconv | 23 +++++++++++------------ admin/charsets/mule-charsets.el | 11 +++++------ admin/cus-test.el | 10 ++++------ admin/diff-tar-files | 19 +++++++++---------- admin/make-announcement | 11 +++++------ admin/make-emacs | 22 ++++++++++------------ admin/notes/copyright | 10 ++++------ admin/notes/font-backend | 10 ++++------ admin/notes/lel-TODO | 10 ++++------ admin/notes/multi-tty | 10 ++++------ admin/notes/unicode | 10 ++++------ admin/nt/README-UNDUMP.W32 | 10 ++++------ admin/nt/README-ftp-server | 10 ++++------ admin/nt/README.W32 | 10 ++++------ admin/nt/makedist.bat | 23 +++++++++++------------ admin/quick-install-emacs | 11 +++++------ admin/revdiff | 17 ++++++++--------- admin/unidata/Makefile.in | 11 +++++------ admin/unidata/makefile.w32-in | 11 +++++------ admin/unidata/unidata-gen.el | 10 ++++------ 33 files changed, 215 insertions(+), 270 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index ca937e236e3..9480ac328fb 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -655,15 +655,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 @@ -671,8 +671,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: 97728c77-77c0-4156-b669-0e8c07d94e5a diff --git a/admin/README b/admin/README index 4dd14b335a3..c6d0c02cde3 100644 --- a/admin/README +++ b/admin/README @@ -66,13 +66,20 @@ Show files added/removed between two tar files. Get CVS diffs of files. +Brief description of sub-directories: + +charsets scripts for generating charset map files + in ../etc/charsets +unidata scripts for generating character property files + in ../lisp/international + 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 @@ -80,20 +87,11 @@ 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 paragraph-separate: "[ ]*$" end: -Brief description of sub-directories: - -charsets scripts for generating charset map files - in ../etc/charsets -unidata scripts for generating character property files - in ../lisp/international - # arch-tag: 812b9461-bc0a-46a7-925e-24bd41118463 diff --git a/admin/admin.el b/admin/admin.el index 05cd7f94467..828e87f4225 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -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 . ;;; Commentary: diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index b0d4893181c..40e05d0a09f 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c @@ -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,8 @@ 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 . */ + #include #include diff --git a/admin/build-configs b/admin/build-configs index 66c4f4d71b9..5120fac9093 100755 --- a/admin/build-configs +++ b/admin/build-configs @@ -1,26 +1,24 @@ #! /usr/bin/perl +# Build Emacs in several different configurations. # 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 # 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 . -# Build Emacs in several different configurations. require 5; use Getopt::Long; diff --git a/admin/charsets/Makefile b/admin/charsets/Makefile index d9cc18bf17a..e0fefd830e8 100644 --- a/admin/charsets/Makefile +++ b/admin/charsets/Makefile @@ -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,11 +16,9 @@ # 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 +# Commentary: # At first, set these environment variables: # GLIBC_CHARMAPS diff --git a/admin/charsets/big5.awk b/admin/charsets/big5.awk index c9a0854f76f..5a23b370b4f 100644 --- a/admin/charsets/big5.awk +++ b/admin/charsets/big5.awk @@ -1,23 +1,21 @@ # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 -# + # 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 . BEGIN { tohex["A"] = 10; diff --git a/admin/charsets/compact.awk b/admin/charsets/compact.awk index f4a8790f9b3..b1f5db1f40a 100644 --- a/admin/charsets/compact.awk +++ b/admin/charsets/compact.awk @@ -2,25 +2,23 @@ # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 -# + # 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 . -# Comment: +# Commentary: # Make a charset map compact by changing this kind of line sequence: # 0x00 0x0000 # 0x01 0x0001 diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk index f4b50925fc9..a81023ad350 100644 --- a/admin/charsets/cp51932.awk +++ b/admin/charsets/cp51932.awk @@ -2,25 +2,23 @@ # Copyright (C) 2004, 2005, 2006, 2007, 2008 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 -# + # 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 . -# Comment: +# Commentary: # Genereate a translation table for CP51932 (EUC-JP of MicroSoft Version). # It maps invalid JISX0208 code points used by CP51932 to Unicode. diff --git a/admin/charsets/cp932.awk b/admin/charsets/cp932.awk index 84ce17b9ea0..8d25677be71 100644 --- a/admin/charsets/cp932.awk +++ b/admin/charsets/cp932.awk @@ -2,25 +2,24 @@ # Copyright (C) 2004, 2005, 2006, 2007, 2008 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 -# + # 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: -# Comment: # Add a sort key 0, 1, 2, or 3 at the tail of each line as a comment # to realize the round trip mapping to Unicode works as described in # this page: diff --git a/admin/charsets/eucjp-ms.awk b/admin/charsets/eucjp-ms.awk index 1c508ec9ca9..961300b01d5 100644 --- a/admin/charsets/eucjp-ms.awk +++ b/admin/charsets/eucjp-ms.awk @@ -2,25 +2,23 @@ # Copyright (C) 2004, 2005, 2006, 2007, 2008 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 -# + # 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 . -# Comment: +# Commentary: # eucJP-ms is one of eucJP-open encoding defined at this page: # http://www.opengroup.or.jp/jvc/cde/appendix.html diff --git a/admin/charsets/gb180302.awk b/admin/charsets/gb180302.awk index a9ebc42a9a7..7e072e0bf99 100644 --- a/admin/charsets/gb180302.awk +++ b/admin/charsets/gb180302.awk @@ -1,23 +1,21 @@ # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 -# + # 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 . BEGIN { tohex["A"] = 10; diff --git a/admin/charsets/gb180304.awk b/admin/charsets/gb180304.awk index a323f2c9143..9ff0ca109a8 100644 --- a/admin/charsets/gb180304.awk +++ b/admin/charsets/gb180304.awk @@ -1,23 +1,21 @@ # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 -# + # 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 . BEGIN { tohex["A"] = 10; diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv index 73b6b975331..aee23a11209 100755 --- a/admin/charsets/mapconv +++ b/admin/charsets/mapconv @@ -1,27 +1,26 @@ #!/bin/sh -# + # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 -# + # 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: -# Comment: # Convert charset map of various format into this: # 0xXX 0xYYYY # where, diff --git a/admin/charsets/mule-charsets.el b/admin/charsets/mule-charsets.el index b104b9ab775..04797b4b6ee 100644 --- a/admin/charsets/mule-charsets.el +++ b/admin/charsets/mule-charsets.el @@ -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 . + (if (or (< emacs-major-version 21) (< emacs-minor-version 3) diff --git a/admin/cus-test.el b/admin/cus-test.el index 96fae1f70e4..51034624b58 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el @@ -10,10 +10,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 @@ -21,9 +21,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/admin/diff-tar-files b/admin/diff-tar-files index 0d142768bfc..851f82cf2be 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files @@ -2,23 +2,22 @@ # 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 # 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 . + if [ $# != 2 ]; then cat <. + ### Code: diff --git a/admin/make-emacs b/admin/make-emacs index f54bc481cfa..73077068316 100755 --- a/admin/make-emacs +++ b/admin/make-emacs @@ -1,27 +1,25 @@ #! /usr/bin/perl +# Build Emacs with various options for profiling, debugging, +# with and without warnings enabled etc. # 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 # 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 . -# Build Emacs with various options for profiling, debugging, -# with and without warnings enabled etc. require 5; use Getopt::Long; diff --git a/admin/notes/copyright b/admin/notes/copyright index 975caef3b30..47414baedea 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -655,10 +655,10 @@ under GPLv2 (no "or later"). See: 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 @@ -666,6 +666,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/admin/notes/font-backend b/admin/notes/font-backend index f787915c1aa..4da022917cb 100644 --- a/admin/notes/font-backend +++ b/admin/notes/font-backend @@ -65,10 +65,10 @@ In such a case, please try this: 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 @@ -76,6 +76,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/admin/notes/lel-TODO b/admin/notes/lel-TODO index 9246f1dc8c2..948863c2e15 100644 --- a/admin/notes/lel-TODO +++ b/admin/notes/lel-TODO @@ -107,10 +107,10 @@ See the end of the file for license conditions. 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 @@ -118,9 +118,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/admin/notes/multi-tty b/admin/notes/multi-tty index c20364ec576..c3d432d17c5 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -1347,10 +1347,10 @@ DIARY OF 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 @@ -1358,8 +1358,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: 8da1619e-2e79-41a8-9ac9-a0485daad17d diff --git a/admin/notes/unicode b/admin/notes/unicode index 0f76a3d36f9..4f0becc4596 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -130,10 +130,10 @@ regard to completeness. 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 @@ -141,6 +141,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/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32 index e1634448be1..fc778d1321f 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 @@ -42,10 +42,10 @@ Enjoy! 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 @@ -53,6 +53,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/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index 93f8682b133..d16d07a6af9 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -278,10 +278,10 @@ See the end of the file for license conditions. 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,6 +289,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/admin/nt/README.W32 b/admin/nt/README.W32 index 8562b04b6a2..1eac6caf1a6 100644 --- a/admin/nt/README.W32 +++ b/admin/nt/README.W32 @@ -264,10 +264,10 @@ See the end of the file for license conditions. 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 @@ -275,6 +275,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/admin/nt/makedist.bat b/admin/nt/makedist.bat index 4cd1da6c316..2e1cb3bedd9 100755 --- a/admin/nt/makedist.bat +++ b/admin/nt/makedist.bat @@ -2,28 +2,27 @@ rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 rem Free Software Foundation, Inc. -rem + rem Cannot use brackets in andrewi's email below because rem older Windows shells will treat that as redirection. -rem + rem Author: Andrew Innes andrewi@gnu.org -rem + rem This file is part of GNU Emacs. -rem -rem GNU Emacs is free software; you can redistribute it and/or modify + +rem GNU Emacs is free software: you can redistribute it and/or modify rem it under the terms of the GNU General Public License as published by -rem the Free Software Foundation; either version 3, or (at your option) -rem any later version. -rem +rem the Free Software Foundation, either version 3 of the License, or +rem (at your option) any later version. + rem GNU Emacs is distributed in the hope that it will be useful, rem but WITHOUT ANY WARRANTY; without even the implied warranty of rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the rem GNU General Public License for more details. -rem + rem You should have received a copy of the GNU General Public License -rem along with GNU Emacs; see the file COPYING. If not, write to the -rem Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -rem Boston, MA 02110-1301, USA. +rem along with GNU Emacs. If not, see http://www.gnu.org/licenses/. + if (%3) == () goto usage if not (%4) == () goto %4 diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index e4e77a14f2c..675750a43e8 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -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,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 . + ### Commentary: diff --git a/admin/revdiff b/admin/revdiff index 9e47a1eba2c..eccfdd7f55c 100755 --- a/admin/revdiff +++ b/admin/revdiff @@ -4,21 +4,20 @@ # 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 . + use File::Basename; diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index c0b9da8f855..074af1309b1 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/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 . + EMACS = ../../src/emacs DSTDIR = ../../lisp/international diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in index 0a933e81d13..1c4ec22fa1f 100644 --- a/admin/unidata/makefile.w32-in +++ b/admin/unidata/makefile.w32-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 . + EMACS = ../../src/$(BLD)/emacs.exe DSTDIR = ../../lisp/international diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index 8f8a9cb02af..84fd8889ae0 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el @@ -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 . ;;; Commentary: -- 2.39.5