aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-09-29 22:43:12 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-09-29 22:43:12 +0000
commit330f92d73d6d1ce892bc36541197cf8357535bee (patch)
treefe42296a4a50c837f306f22a3a36b5cd73d21c53
parentce828071fb049a45dd1aaf89fe1e40b896b8dc6d (diff)
downloadbusybox-w32-330f92d73d6d1ce892bc36541197cf8357535bee.tar.gz
busybox-w32-330f92d73d6d1ce892bc36541197cf8357535bee.tar.bz2
busybox-w32-330f92d73d6d1ce892bc36541197cf8357535bee.zip
Mention the new gpl@busybox.net address.
git-svn-id: svn://busybox.net/trunk/busybox@16265 69ca8d6d-28ef-0310-b511-8ec308f3f277
-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>
62<h3>License enforcement</h3> 62<h3>License enforcement</h3>
63 63
64<p>BusyBox's copyrights are enforced by the <a 64<p>BusyBox's copyrights are enforced by the <a
65href="http://www.softwarefreedom.org">Software Freedom Law Center</a>, which 65href="http://www.softwarefreedom.org">Software Freedom Law Center</a>
66(you can contact them at gpl@busybox.net), which
66"accepts primary responsibility for enforcement of US copyrights on the 67"accepts primary responsibility for enforcement of US copyrights on the
67software... and coordinates international copyright enforcement efforts for 68software... and coordinates international copyright enforcement efforts for
68such works as necessary." If you distribute BusyBox in a way that doesn't 69such 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 @@
2 2
3 3
4<ul> 4<ul>
5 <li><b>Sep 29, 2006 -- New license email address.</b>
6 <p>The email address gpl@busybox.net is now the recommended way to contact
7 the Software Freedom Law Center to report BusyBox license violations.</p>
8
5 <li><b>31 July 2006 -- BusyBox 1.2.1 (stable)</b> 9 <li><b>31 July 2006 -- BusyBox 1.2.1 (stable)</b>
6 <p>Since nobody seems to have objected too loudly over the weekend, I 10 <p>Since nobody seems to have objected too loudly over the weekend, I
7 might as well point you all at 11 might as well point you all at