X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=README;h=4d3ce2f005b2c78679410fcd42c027f0539d11fb;hp=3fea5d493e2162c178ba61dbff182a5a357af7ab;hb=fb0946c7fc6f1831894e8fd67389c0bc74a387b8;hpb=6633b74930870ffb148c46129c738af78082d934 diff --git a/README b/README index 3fea5d49..4d3ce2f0 100644 --- a/README +++ b/README @@ -52,6 +52,9 @@ Please report bugs in Wget to . 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: Micah Cowan Wget was originally written and mainained by Hrvoje Niksic. Please see @@ -60,7 +63,7 @@ for a detailed listing of all contributions. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -2005, 2006, 2007 Free Software Foundation, Inc. +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 @@ -77,12 +80,13 @@ along with this program; if not, write to the Free Software 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 -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. +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.