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

[wget] / README

diff --git a/README b/README
index 347cb71cbe9f495b9356e4aa0dd4d09e41c3c77a..cff06b9543e46d1b5698323757d07363036f9829 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
                                                           -*- 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
@@ -36,38 +36,34 @@ options, or via initialization file .wgetrc.  Wget allows you to
 install a global startup file (/usr/local/etc/wgetrc by default) for
 site settings.
 
-Wget works under almost all modern Unix variants and, unlike many of
-its predecessors, is written entirely in C, thus requiring no
-additional software (like perl).  As Wget uses the GNU Autoconf, it is
-easily built on and ported to other Unix's. Installation procedure is
-described in the INSTALL file.
+Wget works under almost all Unix variants in use today and, unlike
+many of its historical predecessors, is written entirely in C, thus
+requiring no additional software, such as Perl.  The external software
+it does work with, such as OpenSSL, is optional.  As Wget uses the GNU
+Autoconf, it is easily built on and ported to new Unix-like systems.
+The installation procedure is described in the INSTALL file.
 
-Like all GNU utilities, the latest version of Wget can be found at the
-master GNU archive site ftp.gnu.org, and its mirrors.  For example,
-Wget 1.9 is available at:
-
-    ftp://ftp.gnu.org/pub/gnu/wget/wget-1.9.tar.gz
+As with other GNU software, the latest version of Wget can be found at
+the master GNU archive site ftp.gnu.org, and its mirrors.  Wget
+resides at <ftp://ftp.gnu.org/pub/gnu/wget/>.
 
 Please report bugs in Wget to <bug-wget@gnu.org>.
 
-Wget has a mailing list at <wget@sunsite.dk>.  To subscribe, mail to
-<wget-subscribe@sunsite.dk>.  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.
-
+See the file `MAILING-LIST' for information about Wget mailing lists.
+Wget's home page is at <http://wget.sunsite.dk/>.
 
-MAINTAINER: Hrvoje Niksic <hniksic@xemacs.org>
+MAINTAINER: Micah Cowan <micah@cowan.name>
 
-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) 2003 Free Software Foundation, Inc.
+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,
@@ -77,7 +73,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA.
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the