Switch to recommended form of GPLv3 permissions notice.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 075814f120eef9c7af5aff0e8c9e9206d31578ac..886dfe085a3517b53452eebc585a27dd14f73297 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1617,10 +1617,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
@@ -1628,8 +1628,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 <http://www.gnu.org/licenses/>.
 
 ;;; arch-tag: b3d2c29c-04a0-45d0-b52d-57354711c414

diff --git a/nt/INSTALL b/nt/INSTALL
index 0c1ae492a28c17459dc5b7f297d6380a03ffd9bb..3157961cd59d98e159cd1dbbc93eeffbbe7fef4d 100644 (file)
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -526,10 +526,10 @@
 \f
 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
@@ -537,6 +537,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 <http://www.gnu.org/licenses/>.

diff --git a/nt/README b/nt/README
index bb92210d6cd36d3d9aecefd5bbb563fadc73a488..666a0fb6b4667b5acadb567a373e1f0652f0bdd3 100644 (file)
--- a/nt/README
+++ b/nt/README
@@ -115,10 +115,10 @@
 \f
 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
@@ -126,6 +126,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 <http://www.gnu.org/licenses/>.

diff --git a/nt/addpm.c b/nt/addpm.c
index b05494a46789416872e2dac6eb8bd3a7c20a55b4..c053810baaa733fbf18640c8a9dfb2917d8c33fb 100644 (file)
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -1,13 +1,13 @@
 /* Add entries to the GNU Emacs Program Manager folder.
-   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.
 
 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,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 <http://www.gnu.org/licenses/>.  */
 
 /****************************************************************************
  *

diff --git a/nt/addsection.c b/nt/addsection.c
index 6eb2ee37038096298dc4a33daf2274654a2ddc9a..240286fc01e8f73d353d036929392bb463fb0380 100644 (file)
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -1,13 +1,13 @@
 /* Add an uninitialized data section to an executable.
-   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007, 2008  Free Software Foundation, Inc.
+   Copyright (C) 1999, 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
@@ -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 <http://www.gnu.org/licenses/>.
+
 
    Andrew Innes <andrewi@harlequin.co.uk>       04-Jan-1999
      based on code from unexw32.c

diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 631570b9d5dd42b4f20d312d714b6712609d7540..edf7b364671d3a8f1791b57b1b20b6dd82f7d0b3 100644 (file)
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -1,6 +1,6 @@
 /* Proxy shell designed for use with Emacs on Windows 95 and NT.
-   Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007, 2008  Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+     2008  Free Software Foundation, Inc.
 
    Accepts subset of Unix sh(1) command-line options, for compatability
    with elisp code written for Unix.  When possible, executes external
@@ -15,10 +15,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
@@ -26,9 +26,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 <http://www.gnu.org/licenses/>.  */
 
 #include <windows.h>
 

diff --git a/nt/config.nt b/nt/config.nt
index a8075a7466c2e5364aba7cdabd473086b80a05e2..777fe83c9c20eacb52ec2a580812506ee17229f7 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1,13 +1,13 @@
 /* GNU Emacs site configuration template file.  -*- C -*-
-   Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1994, 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
@@ -15,9 +15,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 <http://www.gnu.org/licenses/>.  */
 
 
 /* No code in Emacs #includes config.h twice, but some of the code

diff --git a/nt/configure.bat b/nt/configure.bat
index ff47f033ba258ae33e3879bf946f6ff3d0ff617b..a26f369f0b85abe87278cdbd72a0967d342b986a 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -6,10 +6,10 @@ rem      2006, 2007, 2008 Free Software Foundation, Inc.
 \r
 rem   This file is part of GNU Emacs.\r
 \r
-rem   GNU Emacs is free software; you can redistribute it and/or modify\r
+rem   GNU Emacs is free software: you can redistribute it and/or modify\r
 rem   it under the terms of the GNU General Public License as published by\r
-rem   the Free Software Foundation; either version 3, or (at your option)\r
-rem   any later version.\r
+rem   the Free Software Foundation, either version 3 of the License, or\r
+rem   (at your option) any later version.\r
 \r
 rem   GNU Emacs is distributed in the hope that it will be useful,\r
 rem   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
@@ -17,9 +17,8 @@ rem   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 rem   GNU General Public License for more details.\r
 \r
 rem   You should have received a copy of the GNU General Public License\r
-rem   along with GNU Emacs; see the file COPYING.  If not, write to the\r
-rem   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
-rem   Boston, MA 02110-1301, USA.\r
+rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.\r
+\r
 rem   ----------------------------------------------------------------------\r
 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:\r
 rem\r

diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index 1f3eac077cb58b9f78d7b1dfbf3a3ae85e7c4232..b43a5bb84af389de8060afe6f0d74bdac362d8ee 100644 (file)
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.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,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 <http://www.gnu.org/licenses/>.  */
 
 #include <windows.h>
 #include <ddeml.h>

diff --git a/nt/envadd.bat b/nt/envadd.bat
index 029d090ab65d1b0c20fbd64cf2f441f02c4b582f..ae17b1404424e4d2fd9d9689b5c35708f1131243 100644 (file)
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -1,26 +1,25 @@
 rem  Hack to change/add environment variables in the makefiles for the\r
 rem  Windows platform.\r
-rem\r
-rem  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.\r
-rem\r
+\r
+rem  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008\r
+rem    Free Software Foundation, Inc.\r
+\r
 rem  This file is part of GNU Emacs.\r
-rem\r
-rem  GNU Emacs is free software; you can redistribute it and/or modify\r
+\r
+rem  GNU Emacs is free software: you can redistribute it and/or modify\r
 rem  it under the terms of the GNU General Public License as published by\r
-rem  the Free Software Foundation; either version 3, or (at your option)\r
-rem  any later version.\r
-rem\r
+rem  the Free Software Foundation, either version 3 of the License, or\r
+rem  (at your option) any later version.\r
+\r
 rem  GNU Emacs is distributed in the hope that it will be useful,\r
 rem  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
 rem  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
 rem  GNU General Public License for more details.\r
-rem\r
+\r
 rem  You should have received a copy of the GNU General Public License\r
-rem  along with GNU Emacs; see the file COPYING.  If not, write to\r
-rem  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
-rem  Boston, MA 02110-1301, USA.\r
-rem\r
-rem\r
+rem  along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.\r
+\r
+\r
 rem  Usage:\r
 rem    envadd "ENV1=VAL1" "ENV2=VAL2" ... /C <command line>\r
 rem\r

diff --git a/nt/gmake.defs b/nt/gmake.defs
index ab1bc10337b5a9d185162513cb9fbfc0d4fcb910..00ae686c3fa37445288f6721b433a312322a3de4 100644 (file)
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -1,21 +1,21 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
-#  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#    2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-#
-#  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 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.
+#  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
+# 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.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure 'all' is the default target
 all:

diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index 8cc4a2be9112c697655180750a891a6c60be096f..873c1ea7ad89d19bb2ce7ea3229bb8ce219b5d02 100755 (executable)
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -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,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 <http://www.gnu.org/licenses/>.  */
 
 #ifndef _GRP_H
 #define _GRP_H

diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h
index 9685e4e8f072021c14419228edd0801677666d66..a840867687ffb4fc1139c3a7abc8112ef134a11d 100644 (file)
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -3,10 +3,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
@@ -14,9 +14,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 <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LANGINFO_H
 #define _LANGINFO_H

diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h
index 7a43523cb9bcdef49b79b62b5e9ec08ffe93d5c2..8004c765bc415d4df44c2017e93ffa0d135edaac 100644 (file)
--- a/nt/inc/nl_types.h
+++ b/nt/inc/nl_types.h
@@ -3,10 +3,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
@@ -14,9 +14,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 <http://www.gnu.org/licenses/>.  */
 
 #ifndef _NL_TYPES_H
 #define _NL_TYPES_H

diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 741926fd87fb50bb7c77c7262bc4da961664c42b..a8c857f1962ca90088704b6ae7f382199accf7b8 100644 (file)
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -1,12 +1,12 @@
-/* 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.
 
 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
@@ -14,9 +14,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 <http://www.gnu.org/licenses/>.  */
 
 
 /* Workable version of <sys/socket.h> based on winsock.h */

diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h
index c9bb3ca5f242aa012cb9f3b1d57779f6002427c1..e2329f752394a16408b289d0d70c925d1d6703ae 100644 (file)
--- a/nt/inc/sys/stat.h
+++ b/nt/inc/sys/stat.h
@@ -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 @@ 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 <http://www.gnu.org/licenses/>.  */
 
 #ifndef INC_SYS_STAT_H_
 #define INC_SYS_STAT_H_

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 053961a0c58d2d336e591004971660e63da727f4..026b8ab58033c97ba2ebf69cdb34238b93029aa7 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,25 +1,24 @@
-#  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.\r
-#  Copyright (C) 2000, 2001, 2002, 2003, 2004,\r
-#    2005, 2006, 2007, 2008 Free Software Foundation, Inc.\r
+# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.\r
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,\r
+#    2008 Free Software Foundation, Inc.\r
 #\r
-#  Top level makefile for building GNU Emacs on Windows NT\r
+# Top level makefile for building GNU Emacs on Windows NT\r
 #\r
-#  This file is part of GNU Emacs.\r
-#\r
-#  GNU Emacs is free software; you can redistribute it and/or modify\r
-#  it under the terms of the GNU General Public License as published by\r
-#  the Free Software Foundation; either version 3, or (at your option)\r
-#  any later version.\r
-#\r
-#  GNU Emacs is distributed in the hope that it will be useful,\r
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-#  GNU General Public License for more details.\r
-#\r
-#  You should have received a copy of the GNU General Public License\r
-#  along with GNU Emacs; see the file COPYING.  If not, write to\r
-#  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
-#  Boston, MA 02110-1301, USA.\r
+# This file is part of GNU Emacs.\r
+\r
+# GNU Emacs is free software: you can redistribute it and/or modify\r
+# it under the terms of the GNU General Public License as published by\r
+# the Free Software Foundation, either version 3 of the License, or\r
+# (at your option) any later version.\r
+\r
+# GNU Emacs is distributed in the hope that it will be useful,\r
+# but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+# GNU General Public License for more details.\r
+\r
+# You should have received a copy of the GNU General Public License\r
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.\r
+\r
 \r
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out\r
 #        (and remove or replace this comment).\r

diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
index 9632eee553c8623f82526f8b07c052452cb2604e..f84322c541663ba1cacbcf037d6e5639b99af2c7 100644 (file)
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -2,27 +2,26 @@
 \r
 rem  Hack to run install-info with multiple info files on the command\r
 rem  line on the Windows platform.\r
-rem\r
-rem  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.\r
-rem\r
+\r
+rem  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008\r
+rem    Free Software Foundation, Inc.\r
+\r
 rem  This file is part of GNU Emacs.\r
-rem\r
-rem  GNU Emacs is free software; you can redistribute it and/or modify\r
-rem  it under the terms of the GNU General Public License as published by\r
-rem  the Free Software Foundation; either version 3, or (at your option)\r
-rem  any later version.\r
-rem\r
-rem  GNU Emacs is distributed in the hope that it will be useful,\r
-rem  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-rem  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-rem  GNU General Public License for more details.\r
-rem\r
-rem  You should have received a copy of the GNU General Public License\r
-rem  along with GNU Emacs; see the file COPYING.  If not, write to\r
-rem  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
-rem  Boston, MA 02110-1301, USA.\r
-rem\r
-rem\r
+\r
+rem   GNU Emacs is free software: you can redistribute it and/or modify\r
+rem   it under the terms of the GNU General Public License as published by\r
+rem   the Free Software Foundation, either version 3 of the License, or\r
+rem   (at your option) any later version.\r
+\r
+rem   GNU Emacs is distributed in the hope that it will be useful,\r
+rem   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+rem   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+rem   GNU General Public License for more details.\r
+\r
+rem   You should have received a copy of the GNU General Public License\r
+rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.\r
+\r
+\r
 rem  Usage:\r
 rem   multi-install-info <switch passed to install-info> FILE1 FILE2 ...\r
 rem\r

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 576671c20f6e726de40d89daca73f0627870ea22..7c6a518ee3593484fa5aef92c2a72a244983a9a3 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,21 +1,22 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.\r
-#  Copyright (C) 2000, 2001, 2002, 2003, 2004,\r
-#    2005, 2006, 2007, 2008 Free Software Foundation, Inc.\r
-#\r
-#  GNU Emacs is free software; you can redistribute it and/or modify\r
-#  it under the terms of the GNU General Public License as published by\r
-#  the Free Software Foundation; either version 3, or (at your option)\r
-#  any later version.\r
-#\r
-#  GNU Emacs is distributed in the hope that it will be useful,\r
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-#  GNU General Public License for more details.\r
-#\r
-#  You should have received a copy of the GNU General Public License\r
-#  along with GNU Emacs; see the file COPYING.  If not, write to\r
-#  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
-#  Boston, MA 02110-1301, USA.\r
+#  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,\r
+#    2008 Free Software Foundation, Inc.\r
+\r
+# This file is part of GNU Emacs.\r
+\r
+# GNU Emacs is free software: you can redistribute it and/or modify\r
+# it under the terms of the GNU General Public License as published by\r
+# the Free Software Foundation, either version 3 of the License, or\r
+# (at your option) any later version.\r
+\r
+# GNU Emacs is distributed in the hope that it will be useful,\r
+# but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+# GNU General Public License for more details.\r
+\r
+# You should have received a copy of the GNU General Public License\r
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.\r
+\r
 \r
 # Ensure 'all' is the default target\r
 all:\r

diff --git a/nt/paths.h b/nt/paths.h
index 714471541da68d7a3f5b6ffdd5cd49eace40007a..6662c6c4d3d8df322f77b3dfc4e10818a13a76c4 100644 (file)
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -3,10 +3,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
@@ -14,9 +14,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 <http://www.gnu.org/licenses/>.  */
 
 
 /* The default search path for Lisp function "load".

diff --git a/nt/preprep.c b/nt/preprep.c
index f53cea7a9cb4d30402da9bc0a412eab03be9a1ab..9565a3fa24c258d6ae062e5d0d1e238f7a93a798 100644 (file)
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -1,13 +1,13 @@
 /* Pro-process emacs.exe for profiling by MSVC.
-   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007, 2008  Free Software Foundation, Inc.
+   Copyright (C) 1999, 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
@@ -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 <http://www.gnu.org/licenses/>.
+
 
    Andrew Innes <andrewi@harlequin.co.uk>       16-Jan-1999
      based on code from addsection.c

diff --git a/nt/runemacs.c b/nt/runemacs.c
index f36ffeed03189cb2a986b9757fc1a42058b840ac..440fd8d95b3039dd538f8b16400c8f6f4874a344 100644 (file)
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -3,10 +3,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
@@ -14,9 +14,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 <http://www.gnu.org/licenses/>.  */
 
 
 /*