aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-09-29 22:43:12 +0000
committerGravatar Rob Landley <rob@landley.net>2006-09-29 22:43:12 +0000
commit530c3ef81824d3b83ef0e8a773eaaae3722f00bf (patch)
treefe42296a4a50c837f306f22a3a36b5cd73d21c53 /docs
parent0b193a787194549bbf22ff6f5db7a52f41da69ef (diff)
downloadbusybox-530c3ef81824d3b83ef0e8a773eaaae3722f00bf.tar.gz
busybox-530c3ef81824d3b83ef0e8a773eaaae3722f00bf.tar.bz2
Mention the new gpl@busybox.net address.
Diffstat (limited to 'docs')
-rw-r--r--docs/busybox.net/license.html3
-rw-r--r--docs/busybox.net/news.html4
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/busybox.net/license.html b/docs/busybox.net/license.html
index 96f7b3a0f..76358bc65 100644
--- a/docs/busybox.net/license.html
+++ b/docs/busybox.net/license.html
@@ -62,7 +62,8 @@ want to use. New development is all GPLv2.</p>
<h3>License enforcement</h3>
<p>BusyBox's copyrights are enforced by the <a
-href="http://www.softwarefreedom.org">Software Freedom Law Center</a>, which
+href="http://www.softwarefreedom.org">Software Freedom Law Center</a>
+(you can contact them at gpl@busybox.net), which
"accepts primary responsibility for enforcement of US copyrights on the
software... and coordinates international copyright enforcement efforts for
such works as necessary." If you distribute BusyBox in a way that doesn't
diff --git a/docs/busybox.net/news.html b/docs/busybox.net/news.html
index 5def5a35c..b82e32032 100644
--- a/docs/busybox.net/news.html
+++ b/docs/busybox.net/news.html
@@ -2,6 +2,10 @@
<ul>
+ <li><b>Sep 29, 2006 -- New license email address.</b>
+ <p>The email address gpl@busybox.net is now the recommended way to contact
+ the Software Freedom Law Center to report BusyBox license violations.</p>
+
<li><b>31 July 2006 -- BusyBox 1.2.1 (stable)</b>
<p>Since nobody seems to have objected too loudly over the weekend, I
might as well point you all at