[svn] Merging in fix for bug 20341: GPLv3 update, and maintainer references.

Still waiting for rewording of OpenSSL exception; but that could take a
while, and in the meantime, these changes should probably be in the
trunk. Also includes fix to manual, to remove GPL (for the sake of
maintaining lack of invariants).

diff --git a/configure.in b/configure.in
index 9f735391c4c0202b293fe50232facf43d67823f3..c502a7e4ebf0ba50f13d83d30bc06b5dfbb2d650 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Copyright (C) 1995, 1996, 1997, 2001 Free Software Foundation, Inc.
 
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
 
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by

-dnl the Free Software Foundation; either version 2 of the License, or
+dnl the Free Software Foundation; either version 3 of the License, or

 dnl (at your option) any later version.
 
 dnl This program is distributed in the hope that it will be useful,
 dnl (at your option) any later version.
 
 dnl This program is distributed in the hope that it will be useful,


@@ -12,8 +12,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 
 dnl You should have received a copy of the GNU General Public License
 dnl GNU General Public License for more details.
 
 dnl You should have received a copy of the GNU General Public License

-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 dnl In addition, as a special exception, the Free Software Foundation
 dnl gives permission to link the code of its release of Wget with the
 
 dnl In addition, as a special exception, the Free Software Foundation
 dnl gives permission to link the code of its release of Wget with the

diff --git a/src/Makefile.in b/src/Makefile.in
index bcacd7ddc794f31f6571482a6d6fb09356c1bea9..e393e1e055abd23ffdd65d6bcb311f35f505e4f7 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -3,7 +3,7 @@
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program 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 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or

 # (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,


@@ -12,8 +12,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License

-# along with Wget; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# along with Wget.  If not, see <http://www.gnu.org/licenses/>.

 
 # In addition, as a special exception, the Free Software Foundation
 # gives permission to link the code of its release of Wget with the
 
 # In addition, as a special exception, the Free Software Foundation
 # gives permission to link the code of its release of Wget with the