Switch to recommended form of GPLv3 permissions notice.

4 files changed, 23 insertions, 30 deletions

diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32
index e1634448be..fc778d1321 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 <http://www.gnu.org/licenses/>.
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 93f8682b13..d16d07a6af 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 <http://www.gnu.org/licenses/>.
diff --git a/admin/nt/README.W32 b/admin/nt/README.W32
index 8562b04b6a..1eac6caf1a 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 <http://www.gnu.org/licenses/>.
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index 4cd1da6c31..2e1cb3bedd 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