X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=README;h=61cb2aad44a40c5a710f4b3458f6c0c3c2ae9511;hb=0e6f1c2dacb7027247518eb52ab53c92c6d8c467;hp=b062a49e8249ee7542960a93626a192f7c0dd475;hpb=d72a50d4962d8d4dd4802396f1667a8a74206af6;p=wget
diff --git a/README b/README
index b062a49e..61cb2aad 100644
--- a/README
+++ b/README
@@ -55,15 +55,13 @@ 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
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, 1999, 2000, 2001, 2002, 2003, 2004
-2005, 2006, 2007 Free Software Foundation, Inc.
+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
@@ -80,12 +78,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.