Switch to recommended form of GPLv3 permissions notice.

22 files changed, 169 insertions, 202 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 075814f120e..886dfe085a3 100644
--- 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 0c1ae492a28..3157961cd59 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -526,10 +526,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
@@ -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 bb92210d6cd..666a0fb6b46 100644
--- a/nt/README
+++ b/nt/README
@@ -115,10 +115,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
@@ -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 b05494a4678..c053810baaa 100644
--- 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 6eb2ee37038..240286fc01e 100644
--- 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 631570b9d5d..edf7b364671 100644
--- 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 a8075a7466c..777fe83c9c2 100644
--- 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 ff47f033ba2..a26f369f0b8 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -6,10 +6,10 @@ rem      2006, 2007, 2008 Free Software Foundation, Inc.
 

 rem   This file is part of GNU Emacs.

 

-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   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

@@ -17,9 +17,8 @@ rem   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 rem   GNU General Public License for more details.

 

 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/.

+

 rem   ----------------------------------------------------------------------

 rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:

 rem

diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index 1f3eac077cb..b43a5bb84af 100644
--- 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 029d090ab65..ae17b140442 100644
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -1,26 +1,25 @@
 rem  Hack to change/add environment variables in the makefiles for the

 rem  Windows platform.

-rem

-rem  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

-rem

+

+rem  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008

+rem    Free Software Foundation, Inc.

+

 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

-rem  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

-rem  Boston, MA 02110-1301, USA.

-rem

-rem

+rem  along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.

+

+

 rem  Usage:

 rem    envadd "ENV1=VAL1" "ENV2=VAL2" ... /C <command line>

 rem

diff --git a/nt/gmake.defs b/nt/gmake.defs
index ab1bc10337b..00ae686c3fa 100644
--- 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 8cc4a2be911..873c1ea7ad8 100755
--- 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 9685e4e8f07..a840867687f 100644
--- 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 7a43523cb9b..8004c765bc4 100644
--- 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 741926fd87f..a8c857f1962 100644
--- 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 c9bb3ca5f24..e2329f75239 100644
--- 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 053961a0c58..026b8ab5803 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,25 +1,24 @@
-#  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.

-#  Copyright (C) 2000, 2001, 2002, 2003, 2004,

-#    2005, 2006, 2007, 2008 Free Software Foundation, Inc.

+# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.

+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,

+#    2008 Free Software Foundation, Inc.

 #

-#  Top level makefile for building GNU Emacs on Windows NT

+# Top level makefile for building GNU Emacs on Windows NT

 #

-#  This file is part of GNU Emacs.

-#

-#  GNU Emacs is free software; you can redistribute it and/or modify

-#  it under the terms of the GNU General Public License as published by

-#  the Free Software Foundation; either version 3, or (at your option)

-#  any later version.

-#

-#  GNU Emacs is 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.

+# 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/>.

+

 

 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out

 #        (and remove or replace this comment).

diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
index 9632eee553c..f84322c5416 100644
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -2,27 +2,26 @@
 

 rem  Hack to run install-info with multiple info files on the command

 rem  line on the Windows platform.

-rem

-rem  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

-rem

+

+rem  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008

+rem    Free Software Foundation, Inc.

+

 rem  This file is part of GNU Emacs.

-rem

-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  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

-rem  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

-rem  Boston, MA 02110-1301, USA.

-rem

-rem

+

+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 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   You should have received a copy of the GNU General Public License

+rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.

+

+

 rem  Usage:

 rem   multi-install-info <switch passed to install-info> FILE1 FILE2 ...

 rem

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 576671c20f6..7c6a518ee35 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,21 +1,22 @@
 #  -*- 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/paths.h b/nt/paths.h
index 714471541da..6662c6c4d3d 100644
--- 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 f53cea7a9cb..9565a3fa24c 100644
--- 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 f36ffeed031..440fd8d95b3 100644
--- 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/>.  */
 
 
 /*