diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-08-21 14:00:25 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-08-21 14:00:25 +0000 |
commit | e0fe65b68f3bee29d19ef8a3936bd52370a93a20 (patch) | |
tree | 34d0cc3c4fa9c8db5801d4af53ce65277f238bcd | |
parent | 8eeaa747c83ec096a4e73552ae5bdfaaf5824251 (diff) | |
download | busybox-w32-e0fe65b68f3bee29d19ef8a3936bd52370a93a20.tar.gz busybox-w32-e0fe65b68f3bee29d19ef8a3936bd52370a93a20.tar.bz2 busybox-w32-e0fe65b68f3bee29d19ef8a3936bd52370a93a20.zip |
- fix markup
-rw-r--r-- | docs/busybox.net/license.html | 22 |
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 |
12 | the BusyBox source code.</p> | 12 | the 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 |
15 | product</a> should be familiar with the licensing terms under which they are | 15 | product</a> should be familiar with the licensing terms under which they are |
16 | allowed to use and distribute BusyBox. Read the full test of the GPL (either | 16 | allowed to use and distribute BusyBox. Read the full test of the GPL (either |
17 | through the above link, or in the file LICENSE in the busybox tarball), and | 17 | through 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 | |||
32 | GPL version 2, and the project's license is GPL version 2.</p> | 32 | GPL 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 |
35 | 16112) included variants of the recommended "GPL version 2 or (at your option) | 35 | 16112) included variants of the recommended |
36 | later versions" boilerplate permission grant. Ancient versions of BusyBox | 36 | "GPL version 2 or (at your option) later versions" boilerplate |
37 | permission 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 |
39 | redistributed under any version of GPL (including the obsolete V1). This was | 40 | redistributed under any version of GPL (including the obsolete V1). This was |
40 | conceptually similar to a dual license, except that the different licenses were | 41 | conceptually similar to a dual license, except that the different licenses were |
41 | different versions of the GPL.</p> | 42 | different 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 |
44 | licensed under GPL version 2 only. Examples include applets written by Linus | 45 | licensed under GPL version 2 only. Examples include applets written by Linus |
45 | Torvalds (util-linux/mkfs_minix.c and util_linux/mkswap.c) which stated they | 46 | Torvalds (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 | "may be redistributed as per the Linux copyright" (which Linus |
48 | clarified in the | ||
47 | 2.4.0-pre8 release announcement in 2000 was GPLv2 only), and Linux kernel code | 49 | 2.4.0-pre8 release announcement in 2000 was GPLv2 only), and Linux kernel code |
48 | copied into libbb/loop.c (after Linus's announcement). There are probably | 50 | copied into libbb/loop.c (after Linus's announcement). There are probably |
49 | more, because all we used to check was that the code was GPL, not which | 51 | more, 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 |
65 | href="http://www.softwarefreedom.org">Software Freedom Law Center</a> | 67 | href="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 | "accepts primary responsibility for enforcement of US copyrights on the |
68 | software... and coordinates international copyright enforcement efforts for | 70 | software... and coordinates international copyright enforcement efforts for |
69 | such works as necessary." If you distribute BusyBox in a way that doesn't | 71 | such works as necessary." If you distribute BusyBox in a way that doesn't |
70 | comply with the terms of the license BusyBox is distributed under, expect to | 72 | comply with the terms of the license BusyBox is distributed under, expect to |
71 | hear from these guys. Their entire reason for existing is to do pro-bono | 73 | hear from these guys. Their entire reason for existing is to do pro-bono |
72 | legal work for free/open source software projects. (We used to list people who | 74 | legal work for free/open source software projects. (We used to list people who |
73 | violate the BusyBox license in <a href="/shame.html">The Hall of Shame</a>, | 75 | violate the BusyBox license in <a href="shame.html">The Hall of Shame</a>, |
74 | but these days we find it much more effective to hand them over to the | 76 | but these days we find it much more effective to hand them over to the |
75 | lawyers.)</p> | 77 | lawyers.)</p> |
76 | 78 | ||
@@ -88,7 +90,7 @@ with the license on our code.</p> | |||
88 | doing a good job at complying with the GPL, they get to be an | 90 | doing a good job at complying with the GPL, they get to be an |
89 | example of how to do things right. Please take a moment and | 91 | example of how to do things right. Please take a moment and |
90 | check out what they do with | 92 | check 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&childpagename=US%2FLayout&cid=1115416836002&pagename=Linksys%2FCommon%2FVisitorWrapper"> |
92 | distributing the firmware for their WRT54G Router.</a> | 94 | distributing the firmware for their WRT54G Router.</a> |
93 | Following their example would be a fine way to ensure that you | 95 | Following their example would be a fine way to ensure that you |
94 | have also fulfilled your licensing obligations.</p> | 96 | have also fulfilled your licensing obligations.</p> |