summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-08-21 14:00:25 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-08-21 14:00:25 +0000
commite0fe65b68f3bee29d19ef8a3936bd52370a93a20 (patch)
tree34d0cc3c4fa9c8db5801d4af53ce65277f238bcd
parent8eeaa747c83ec096a4e73552ae5bdfaaf5824251 (diff)
downloadbusybox-w32-e0fe65b68f3bee29d19ef8a3936bd52370a93a20.tar.gz
busybox-w32-e0fe65b68f3bee29d19ef8a3936bd52370a93a20.tar.bz2
busybox-w32-e0fe65b68f3bee29d19ef8a3936bd52370a93a20.zip
- fix markup
-rw-r--r--docs/busybox.net/license.html22
1 files changed, 12 insertions, 10 deletions
diff --git a/docs/busybox.net/license.html b/docs/busybox.net/license.html
index 76358bc65..c23287884 100644
--- a/docs/busybox.net/license.html
+++ b/docs/busybox.net/license.html
@@ -11,7 +11,7 @@ familiar with it by now.)</p>
11<p>A complete copy of the license text is included in the file LICENSE in 11<p>A complete copy of the license text is included in the file LICENSE in
12the BusyBox source code.</p> 12the BusyBox source code.</p>
13 13
14<p><a href="/products.html">Anyone thinking of shipping BusyBox as part of a 14<p><a href="products.html">Anyone thinking of shipping BusyBox as part of a
15product</a> should be familiar with the licensing terms under which they are 15product</a> should be familiar with the licensing terms under which they are
16allowed to use and distribute BusyBox. Read the full test of the GPL (either 16allowed to use and distribute BusyBox. Read the full test of the GPL (either
17through the above link, or in the file LICENSE in the busybox tarball), and 17through the above link, or in the file LICENSE in the busybox tarball), and
@@ -32,10 +32,11 @@ of BusyBox may be distributed under. New code added to the tree is licensed
32GPL version 2, and the project's license is GPL version 2.</p> 32GPL version 2, and the project's license is GPL version 2.</p>
33 33
34<p>Older versions of BusyBox (versions 1.2.2 and earlier, up through about svn 34<p>Older versions of BusyBox (versions 1.2.2 and earlier, up through about svn
3516112) included variants of the recommended "GPL version 2 or (at your option) 3516112) included variants of the recommended
36later versions" boilerplate permission grant. Ancient versions of BusyBox 36&quot;GPL version 2 or (at your option) later versions&quot; boilerplate
37permission grant. Ancient versions of BusyBox
37(before svn 49) did not specify any version at all, and section 9 of GPLv2 38(before svn 49) did not specify any version at all, and section 9 of GPLv2
38(the most recent version at the time) says those old versions may be 39(the most recent version at that time) says those old versions may be
39redistributed under any version of GPL (including the obsolete V1). This was 40redistributed under any version of GPL (including the obsolete V1). This was
40conceptually similar to a dual license, except that the different licenses were 41conceptually similar to a dual license, except that the different licenses were
41different versions of the GPL.</p> 42different versions of the GPL.</p>
@@ -43,7 +44,8 @@ different versions of the GPL.</p>
43<p>However, BusyBox has apparently always contained chunks of code that were 44<p>However, BusyBox has apparently always contained chunks of code that were
44licensed under GPL version 2 only. Examples include applets written by Linus 45licensed under GPL version 2 only. Examples include applets written by Linus
45Torvalds (util-linux/mkfs_minix.c and util_linux/mkswap.c) which stated they 46Torvalds (util-linux/mkfs_minix.c and util_linux/mkswap.c) which stated they
46"may be redistributed as per the Linux copyright" (which Linus clarified in the 47&quot;may be redistributed as per the Linux copyright&quot; (which Linus
48clarified in the
472.4.0-pre8 release announcement in 2000 was GPLv2 only), and Linux kernel code 492.4.0-pre8 release announcement in 2000 was GPLv2 only), and Linux kernel code
48copied into libbb/loop.c (after Linus's announcement). There are probably 50copied into libbb/loop.c (after Linus's announcement). There are probably
49more, because all we used to check was that the code was GPL, not which 51more, because all we used to check was that the code was GPL, not which
@@ -62,15 +64,15 @@ want to use. New development is all GPLv2.</p>
62<h3>License enforcement</h3> 64<h3>License enforcement</h3>
63 65
64<p>BusyBox's copyrights are enforced by the <a 66<p>BusyBox's copyrights are enforced by the <a
65href="http://www.softwarefreedom.org">Software Freedom Law Center</a> 67href="http://www.softwarefreedom.org/">Software Freedom Law Center</a>
66(you can contact them at gpl@busybox.net), which 68(you can contact them at gpl@busybox.net), which
67"accepts primary responsibility for enforcement of US copyrights on the 69&quot;accepts primary responsibility for enforcement of US copyrights on the
68software... and coordinates international copyright enforcement efforts for 70software... and coordinates international copyright enforcement efforts for
69such works as necessary." If you distribute BusyBox in a way that doesn't 71such works as necessary.&quot; If you distribute BusyBox in a way that doesn't
70comply with the terms of the license BusyBox is distributed under, expect to 72comply with the terms of the license BusyBox is distributed under, expect to
71hear from these guys. Their entire reason for existing is to do pro-bono 73hear from these guys. Their entire reason for existing is to do pro-bono
72legal work for free/open source software projects. (We used to list people who 74legal work for free/open source software projects. (We used to list people who
73violate the BusyBox license in <a href="/shame.html">The Hall of Shame</a>, 75violate the BusyBox license in <a href="shame.html">The Hall of Shame</a>,
74but these days we find it much more effective to hand them over to the 76but these days we find it much more effective to hand them over to the
75lawyers.)</p> 77lawyers.)</p>
76 78
@@ -88,7 +90,7 @@ with the license on our code.</p>
88doing a good job at complying with the GPL, they get to be an 90doing a good job at complying with the GPL, they get to be an
89example of how to do things right. Please take a moment and 91example of how to do things right. Please take a moment and
90check out what they do with 92check out what they do with
91<a href="http://www.linksys.com/servlet/Satellite?c=L_Content_C1&childpagename=US%2FLayout&cid=1115416836002&pagename=Linksys%2FCommon%2FVisitorWrapper"> 93<a href="http://www.linksys.com/servlet/Satellite?c=L_Content_C1&amp;childpagename=US%2FLayout&amp;cid=1115416836002&amp;pagename=Linksys%2FCommon%2FVisitorWrapper">
92distributing the firmware for their WRT54G Router.</a> 94distributing the firmware for their WRT54G Router.</a>
93Following their example would be a fine way to ensure that you 95Following their example would be a fine way to ensure that you
94have also fulfilled your licensing obligations.</p> 96have also fulfilled your licensing obligations.</p>