Merge SFLC licensing changes for OpenSSL with tip.

[wget] / msdos / config.h

diff --git a/msdos/config.h b/msdos/config.h
index f40eb45cb80b30fea5cb155cd9ef3b1bbef52a1d..25a6df83228f9c0eb851c27c61e94ee3ab8e72e6 100644 (file)
--- a/msdos/config.h
+++ b/msdos/config.h
@@ -16,15 +16,16 @@
    You should have received a copy of the GNU General Public License
    along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
-   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.  */
 
 
 #ifndef CONFIG_DOS_H