Update for release

2 files changed, 44 insertions, 1 deletions

diff --git a/docs/busybox.net/news.html b/docs/busybox.net/news.html
index 550a211c6..3744d2c63 100644
--- a/docs/busybox.net/news.html
+++ b/docs/busybox.net/news.html
@@ -3,11 +3,53 @@
 
 <ul>
 
+  <li><b>20 July 2004 -- BusyBox 1.0.0-rc1 released</b><p>
+
+    Here goes release candidate 1...  This fixes all (most?) of the problems
+    that have turned up since -pre10.  In particular, loading and unloading of
+    kernel modules with 2.6.x kernels should be working much better.
+    <p>
+
+    I <b>really</b> want to get BusyBox 1.0.0 released soon and I see no reason
+    real reason why the 1.0.0 release shouldn't happen with things pretty much as is.
+    Remember, please do not bother to send in patches adding cool new features
+    at this time.  Only bug-fix patches will be accepted.  It would also be
+    <b>very</b> helpful if people could continue to review the BusyBox
+    documentation and submit improvements.
+    <p>
+
+    If you have submitted a bug-fixing patch to the busybox mailing list and no
+    one has emailed you explaining why your patch was rejected, it is safe to
+    say that your patch has been lost or forgotten.  That happens sometimes.
+    Please re-submit your patch or bug report to the BusyBox mailing list, and
+    be sure to put "[PATCH]" at the beginning of the email subject line!
+
+    <p>
+    The <a href="downloads/Changelog">changelog</a> has all the details.
+    And as usual you can <a href="downloads">download busybox here</a>.
+
+    <p>Have Fun!
+
+    <p>
+    On a less happy note, My 92 year old grandmother (my dad's mom) passed away
+    yesterday (June 19th).  The funeral will be Thursday in a little town about
+    2 hours south of my home.  I've checked and there is absolutely no way I
+    could be back in time for the funeral if I attend <a
+    href="http://www.linuxsymposium.org/2004/">OLS</a> and give my presentation
+    as scheduled.
+    <p>
+    As such, it is with great reluctance and sadness that I have come
+    to the conclusion I will have to make my appologies and skip OLS
+    this year.
+    <p>
+
+
+  <p>
   <li><b>13 April 2004 -- BusyBox 1.0.0-pre10 released</b><p>
 
     Ok, I lied.  It turns out that -pre9 will not be the final BusyBox
     pre-release.  With any luck however -pre10 will be, since I <b>really</b>
-    want to get BusyBox 1.0.0 released this week.  As usual, please do not
+    want to get BusyBox 1.0.0 released very soon.  As usual, please do not
     bother to send in patches adding cool new features at this time.  Only
     bug-fix patches will be accepted.  It would also be <b>very</b> helpful if
     people could continue to review the BusyBox documentation and submit
diff --git a/docs/busybox.net/shame.html b/docs/busybox.net/shame.html
index 8e0228ad1..1a1961ef4 100644
--- a/docs/busybox.net/shame.html
+++ b/docs/busybox.net/shame.html
@@ -32,6 +32,7 @@ the busybox license by releasing the source code with your product.
 
 <ul>
 
+  <li><a href="http://www.dlink.com/"> DLink - Model GSL-G604T, DSL-300T, and possibly other models</a>
   <li><a href="http://www.trittontechnologies.com/products.html">Tritton Technologies NAS120</a>
 	<br>see <a href="http://www.ussg.iu.edu/hypermail/linux/kernel/0404.0/1611.html">here for details</a>
   <li><a href="http://www.macsense.com/product/homepod/">Macsense HomePod</a>