Minor doc updates.

[wget] / README

diff --git a/README b/README
index 2f1b3b4b2b7e8b95ead20ffb3f3155ba640337a4..7e74454747c34502d85fdc5311f5e37b89ea1189 100644 (file)
--- a/README
+++ b/README
@@ -1,71 +1,73 @@
                                                           -*- text -*-
 GNU Wget
                                                           -*- text -*-
 GNU Wget

-========                          Home: http://sunsite.dk/wget/
-
-GNU Wget is a free network utility to retrieve files from the World
-Wide Web using HTTP and FTP, the two most widely used Internet
-protocols.  It works non-interactively, thus enabling work in the
-background, after having logged off.
-
-The recursive retrieval of HTML pages, as well as FTP sites is
-supported -- you can use Wget to make mirrors of archives and home
-pages, or traverse the web like a WWW robot (Wget understands
-/robots.txt).
-
-Wget works exceedingly well on slow or unstable connections, keeping
-getting the document until it is fully retrieved.  Re-getting files
-from where it left off works on servers (both HTTP and FTP) that
-support it.  Matching of wildcards and recursive mirroring of
-directories are available when retrieving via FTP.  Both HTTP and FTP
-retrievals can be time-stamped, thus Wget can see if the remote file
-has changed since last retrieval and automatically retrieve the new
-version if it has.
-
-Wget supports proxy servers, which can lighten the network load, speed
-up retrieval and provide access behind firewalls.  If you are behind a
-firewall that requires the use of a socks style gateway, you can get
-the socks library and compile wget with support for socks.
+========
+                  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
+retrieval through HTTP proxies.
+
+It can follow links in HTML pages and create local versions of remote
+web sites, fully recreating the directory structure of the original
+site.  This is sometimes referred to as "recursive downloading."
+While doing that, Wget respects the Robot Exclusion Standard
+(/robots.txt).  Wget can be instructed to convert the links in
+downloaded HTML files to the local files for offline viewing.
+
+Recursive downloading also works with FTP, where Wget can retrieves a
+hierarchy of directories and files.
+
+With both HTTP and FTP, Wget can check whether a remote file has
+changed on the server since the previous run, and only download the
+newer files.
+
+Wget has been designed for robustness over slow or unstable network
+connections; if a download fails due to a network problem, it will
+keep retrying until the whole file has been retrieved.  If the server
+supports regetting, it will instruct the server to continue the
+download from where it left off.
+
+If you are behind a firewall that requires the use of a socks style
+gateway, you can get the socks library and compile wget with support
+for socks.

 
 Most of the features are configurable, either through command-line
 options, or via initialization file .wgetrc.  Wget allows you to
 install a global startup file (/usr/local/etc/wgetrc by default) for
 site settings.
 
 
 Most of the features are configurable, either through command-line
 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
-other similar utilities, 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.6 is at:
-
-    <URL:ftp://ftp.gnu.org/pub/gnu/wget/wget-1.6.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>.
 
 
 Please report bugs in Wget to <bug-wget@gnu.org>.
 

-Wget has a mailing list at <wget@sunsite.auc.dk>.  To subscribe, mail
-to <wget-subscribe@sunsite.auc.dk>.  Wget's home page is at
-<URL:http://sunsite.dk/wget/>.
-
-Wget is free in all senses -- it is freely redistributable, and no
-payment is required.  If you still wish to donate money to the
-developers or fund the development for a specific purpose, please send
-mail to the development mailing list at <wget@sunsite.auc.dk>.
+See the file `MAILING-LIST' for information about Wget mailing lists.
+Wget's home page is at <http://www.gnu.org/software/wget/>.

 
 

+If you would like to contribute code for Wget, please read
+http://wget.addictivecode.org/PatchGuidelines.

 
 

-MAINTAINERS: Dan Harkless <wget@harkless.org>
-             Hrvoje Niksic <hniksic@arsdigita.com>
+MAINTAINER: Micah Cowan <micah@cowan.name>

 
 

-Wget was originally written by Hrvoje Niksic.
+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, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+2005, 2006, 2007, 2008, 2009 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
 
 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,


@@ -75,4 +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
 
 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.
+
+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.