X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=README;h=4d3ce2f005b2c78679410fcd42c027f0539d11fb;hp=347cb71cbe9f495b9356e4aa0dd4d09e41c3c77a;hb=fb0946c7fc6f1831894e8fd67389c0bc74a387b8;hpb=51f277080d5271beb45eb33202b9fcb84914657a
diff --git a/README b/README
index 347cb71c..4d3ce2f0 100644
--- 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,38 @@ 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 .
Please report bugs in Wget to .
-Wget has a mailing list at . To subscribe, mail to
-. Wget's home page is temporarily at
-. It is being migrated to
-, where will be its permanent home.
+See the file `MAILING-LIST' for information about Wget mailing lists.
+Wget's home page is at .
+If you would like to contribute code for Wget, please read
+http://wget.addictivecode.org/PatchGuidelines.
-MAINTAINER: Hrvoje Niksic
+MAINTAINER: Micah Cowan
-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, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+2005, 2006, 2007, 2008 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,14 +77,16 @@ 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.
-
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables. You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL". If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so. If you do not wish to do
-so, delete this exception statement from your version.
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA.
+
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.