I've found a few inconsistencies with the wording of some license
statements refering to "GNU public license" and similar, and have
reworded them properly to "GNU General Public License".
Please apply this to 2.4.0, it's against test9. I'll do one for
2.2.x too, and look for other such typo/thinko stuff.
diff -ruN linux-2.4.0-test9.orig/drivers/mtd/nftl.c linux-2.4.0-test9/drivers/mtd/nftl.c
--- linux-2.4.0-test9.orig/drivers/mtd/nftl.c Thu Aug 24 02:46:47 2000
+++ linux-2.4.0-test9/drivers/mtd/nftl.c Mon Oct 16 06:46:49 2000
@@ -5,7 +5,7 @@
/* $Id: nftl.c,v 1.36 2000/07/13 14:14:20 dwmw2 Exp $ */
/*
- The contents of this file are distributed under the GNU Public
+ The contents of this file are distributed under the GNU General Public
Licence version 2 ("GPL"). The legal note below refers only to the
_use_ of the code in some jurisdictions, and does not in any way
affect the copying, distribution and modification of this code,
diff -ruN linux-2.4.0-test9.orig/drivers/net/eth16i.c linux-2.4.0-test9/drivers/net/eth16i.c
--- linux-2.4.0-test9.orig/drivers/net/eth16i.c Thu Aug 24 02:50:16 2000
+++ linux-2.4.0-test9/drivers/net/eth16i.c Mon Oct 16 06:42:57 2000
@@ -6,7 +6,7 @@
Based on skeleton.c and heavily on at1700.c by Donald Becker
This software may be used and distributed according to the terms
- of the GNU Public Licence, incorporated herein by reference.
+ of the GNU General Public Licence, incorporated herein by reference.
The author may be reached as miku@iki.fi
diff -ruN linux-2.4.0-test9.orig/net/irda/irqueue.c linux-2.4.0-test9/net/irda/irqueue.c
--- linux-2.4.0-test9.orig/net/irda/irqueue.c Tue Jun 27 04:10:27 2000
+++ linux-2.4.0-test9/net/irda/irqueue.c Mon Oct 16 06:50:16 2000
@@ -14,8 +14,8 @@
* All Rights Reserved.
*
* This code is taken from the Vortex Operating System written by Aage
- * Kvalnes. Aage has agreed that this code can use the GPL licence,
- * although he does not use that licence in his own code.
+ * Kvalnes. Aage has agreed that this code can use the GNU General
+ * Public Licence, although he does not use that licence in his own code.
*
* This copyright does however _not_ include the ELF hash() function
* which I currently don't know which licence or copyright it
----------------------------------------------------------------------
Mike A. Harris - Linux advocate - Open source advocate
Computer Consultant - Capslock Consulting
Copyright 2000 all rights reserved
----------------------------------------------------------------------
If you're looking for Linux books, guides, and other documentation, visit
the Linux Documentation Project homepage: http://linuxdoc.org
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Oct 23 2000 - 21:00:08 EST