[svn] Merge of fix for bugs 20341 and 20410.

[wget] / README

diff --git a/README b/README
index 109b7a620614f4262d7de1048a7a3fb81c16f565..cff06b9543e46d1b5698323757d07363036f9829 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
                                                           -*- text -*-
 GNU Wget
 ========
                                                           -*- text -*-
 GNU Wget
 ========

-                             Current Web home: http://wget.sunsite.dk/
+                  Current Web home: http://www.gnu.org/software/wget/

 
 GNU Wget is a free utility for non-interactive download of files from
 the Web.  It supports HTTP, HTTPS, and FTP protocols, as well as
 
 GNU Wget is a free utility for non-interactive download of files from
 the Web.  It supports HTTP, HTTPS, and FTP protocols, as well as


@@ -50,23 +50,20 @@ resides at <ftp://ftp.gnu.org/pub/gnu/wget/>.
 Please report bugs in Wget to <bug-wget@gnu.org>.
 
 See the file `MAILING-LIST' for information about Wget mailing lists.
 Please report bugs in Wget to <bug-wget@gnu.org>.
 
 See the file `MAILING-LIST' for information about Wget mailing lists.

-Wget's home page is temporarily at <http://wget.sunsite.dk/>.  It is
-being migrated to <http://www.gnu.org/software/wget/>, where will be
-its permanent home.
+Wget's home page is at <http://wget.sunsite.dk/>.

 
 

+MAINTAINER: Micah Cowan <micah@cowan.name>

 
 

-MAINTAINER: Mauro Tortonesi <mauro@ferrara.linux.it>
-
-Wget was originally written by Hrvoje Niksic.  Please see the file
-AUTHORS for a list of major contributors, and the ChangeLogs for a
-detailed listing of all contributions.
+Wget was originally written and mainained by Hrvoje Niksic.  Please see
+the file AUTHORS for a list of major contributors, and the ChangeLogs
+for a detailed listing of all contributions.

 
 
 Copyright (C) 1995-2005 Free Software Foundation, Inc.
 
 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
 
 
 Copyright (C) 1995-2005 Free Software Foundation, Inc.
 
 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,