Re: [PATCH] GPL licence corrections
On Mon, 16 Oct 2000, Mike A. Harris wrote: > Actually I just looked through my command history and found the > exact command I used: > > grep -ir "licence" * > ../license-grep-2.4 > > Talk about not being able to decide how to spell something! > Heheh. I normally spell it "license", however I don't know what > got into my mind to spell it two ways. 'Licence' is a British noun. 'License' is a British verb. I believe Americans use the latter for both contexts, and the GPL was written in America, making 'license' 'correct'. 'Practi[cs]e' is similar. -- dwmw2 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] GPL licence corrections
On Mon, 16 Oct 2000, David Woodhouse wrote: >Date: Mon, 16 Oct 2000 13:02:03 +0100 >From: David Woodhouse <[EMAIL PROTECTED]> >To: Mike A. Harris <[EMAIL PROTECTED]> >Cc: Linus Torvalds <[EMAIL PROTECTED]>, > Linux Kernel mailing list <[EMAIL PROTECTED]>, > Alan Cox <[EMAIL PROTECTED]> >Content-Type: text/plain; charset=us-ascii >Subject: Re: [PATCH] GPL licence corrections > > >[EMAIL PROTECTED] said: >> 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". > >If we're referring to it by name, we probably ought to call it the >'GNU General Public License' (sic). You've used the British spelling of >Licence. Personally, I don't care what spelling is used, however I guess the "correct" way though, is the way the license spells it itself, which is: GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble -- I myself spell it this way also, so had I wrote the original, it would have been correct. ;o) Unfortunately, this means I may have missed a lot with my grep, so I'll go back and do another patch. If anyone has any other license inconsistencies, copyright inconsistencies, etc.. please let me know ASAP, and I'll grab them too. -- Mike A. Harris - Linux advocate - Open source advocate Computer Consultant - Capslock Consulting Copyright 2000 all rights reserved -- "If it isn't source, it isn't software." -- NASA - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] GPL licence corrections
On Mon, 16 Oct 2000, [iso-8859-1] André Dahlqvist wrote: >Date: Mon, 16 Oct 2000 14:22:12 +0200 >From: "[iso-8859-1] André Dahlqvist" <[EMAIL PROTECTED]> >To: David Woodhouse <[EMAIL PROTECTED]> >Cc: Mike A. Harris <[EMAIL PROTECTED]>, > Linus Torvalds <[EMAIL PROTECTED]>, > Linux Kernel mailing list <[EMAIL PROTECTED]> >Content-Type: text/plain; charset=iso-8859-1 >Subject: Re: [PATCH] GPL licence corrections > >> If we're referring to it by name, we probably ought to call it the >> 'GNU General Public License' (sic). You've used the British spelling >> of Licence. > >That spelling was obviously used when grepping too, and as a result 343 >occurences of "GNU Public License" (ignoring case) was missed. Actually I just looked through my command history and found the exact command I used: grep -ir "licence" * > ../license-grep-2.4 Talk about not being able to decide how to spell something! Heheh. I normally spell it "license", however I don't know what got into my mind to spell it two ways. Another patch shall be forthcoming. TTYL -- Mike A. Harris - Linux advocate - Open source advocate Computer Consultant - Capslock Consulting Copyright 2000 all rights reserved -- Microsoft Windows(tm). A thirty-two bit extension and graphical shell to a sixteen bit patch to an eight bit operating system originally coded for a four bit microprocessor which was written by a two-bit company that can't stand one bit of competition. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] GPL licence corrections
[EMAIL PROTECTED] said:
> 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".
If we're referring to it by name, we probably ought to call it the
'GNU General Public License' (sic). You've used the British spelling of
Licence.
--- drivers/mtd/nftl.c 2000/09/12 01:27:22 1.40
+++ drivers/mtd/nftl.c 2000/10/16 11:39:57 1.43
@@ -5,10 +5,10 @@
/* $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
- 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,
+ The contents of this file are distributed under the GNU General
+ Public License 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,
which is permitted under the terms of the GPL.
Section 0 of the GPL says:
@@ -26,7 +26,7 @@
being under GPL.
In fact the ISDN case is worse than this, because modification of
- the code automatically invalidates its approval. Modificiation,
+ the code automatically invalidates its approval. Modification,
unlike usage, _is_ one of the rights which is protected by the
GPL. Happily, the law in those places where approval is required
doesn't actually prevent you from modifying the code - it's just
--
dwmw2
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] GPL licence corrections
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.cMon 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 [EMAIL PROTECTED]
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.cMon 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 [EMAIL PROTECTED]
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] GPL licence corrections
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.cMon 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 [EMAIL PROTECTED]
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.cMon 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 [EMAIL PROTECTED]
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] GPL licence corrections
[EMAIL PROTECTED] said:
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".
If we're referring to it by name, we probably ought to call it the
'GNU General Public License' (sic). You've used the British spelling of
Licence.
--- drivers/mtd/nftl.c 2000/09/12 01:27:22 1.40
+++ drivers/mtd/nftl.c 2000/10/16 11:39:57 1.43
@@ -5,10 +5,10 @@
/* $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
- 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,
+ The contents of this file are distributed under the GNU General
+ Public License 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,
which is permitted under the terms of the GPL.
Section 0 of the GPL says:
@@ -26,7 +26,7 @@
being under GPL.
In fact the ISDN case is worse than this, because modification of
- the code automatically invalidates its approval. Modificiation,
+ the code automatically invalidates its approval. Modification,
unlike usage, _is_ one of the rights which is protected by the
GPL. Happily, the law in those places where approval is required
doesn't actually prevent you from modifying the code - it's just
--
dwmw2
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] GPL licence corrections
On Mon, 16 Oct 2000, [iso-8859-1] André Dahlqvist wrote: Date: Mon, 16 Oct 2000 14:22:12 +0200 From: "[iso-8859-1] André Dahlqvist" [EMAIL PROTECTED] To: David Woodhouse [EMAIL PROTECTED] Cc: Mike A. Harris [EMAIL PROTECTED], Linus Torvalds [EMAIL PROTECTED], Linux Kernel mailing list [EMAIL PROTECTED] Content-Type: text/plain; charset=iso-8859-1 Subject: Re: [PATCH] GPL licence corrections If we're referring to it by name, we probably ought to call it the 'GNU General Public License' (sic). You've used the British spelling of Licence. That spelling was obviously used when grepping too, and as a result 343 occurences of "GNU Public License" (ignoring case) was missed. Actually I just looked through my command history and found the exact command I used: grep -ir "licence" * ../license-grep-2.4 Talk about not being able to decide how to spell something! Heheh. I normally spell it "license", however I don't know what got into my mind to spell it two ways. Another patch shall be forthcoming. TTYL -- Mike A. Harris - Linux advocate - Open source advocate Computer Consultant - Capslock Consulting Copyright 2000 all rights reserved -- Microsoft Windows(tm). A thirty-two bit extension and graphical shell to a sixteen bit patch to an eight bit operating system originally coded for a four bit microprocessor which was written by a two-bit company that can't stand one bit of competition. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] Please read the FAQ at http://www.tux.org/lkml/
