4 files changed, 78 insertions, 4 deletions
diff --git a/libjava/classpath/doc/www.gnu.org/events/events.wml b/libjava/classpath/doc/www.gnu.org/events/events.wml
index fcb3de9..873d4fa 100644
--- a/libjava/classpath/doc/www.gnu.org/events/events.wml
+++ b/libjava/classpath/doc/www.gnu.org/events/events.wml
@@ -9,17 +9,59 @@
 <boxitem>
 <strong>Upcoming Events:</strong><br>
 <ul>
-none
+<li>[1-5 Aug 2005] <a href="http://conferences.oreillynet.com/os2005/">OSCON</a>, Portland, Oregon - USA
+<ul>
+<li><a href="http://conferences.oreillynet.com/cs/os2005/view/e_sess/6730">The State of Free JVMs</a>
+Tom Tromey</li>
+</ul>
 </ul>
 </boxitem>
 
 <boxitem>
 <strong>Past Events:</strong><br>
 <ul>
-<li>[26+27 Feb. 2004] FOSDEM'05 in Brussels, Belgium. [<createlink name="Escape The Java Trap!" url="events/escape_fosdem05.html">]
-<li>[14+15 Oct. 2003] Linux Kongress '03 in Saarbr&uuml;cken, Germany.
+
+<li>
+[29-31 May 2005] <a href="http://2005.guadec.org/">Guadec</a>, Stuttgart - Germany
+<ul>
+<li><a href="http://2005.guadec.org/schedule/gnometalks.html#eclipseyou">The Eclipse IDE and you</a>
+Ben Konrath and Andrew Overholt
+(<a href="http://overholt.ca/eclipse/GUADEC2005-EclipseIDE.pdf">slides</a>)</li>
+<li><a href="http://2005.guadec.org/schedule/gnometalks.html#javagnome">Eclipse, Java-GNOME, and GCJ</a>
+Andrew Cowie and Ben Konrath</li>
+</ul>
+<p>
+<li>
+[1-4 Jun. 2005] <a href="http://fisl.softwarelivre.org/6.0/">6th International Free Software Forum</a> (fisl), Porto Alegre/RS, Brazil
+<ul>
+<li><a href="http://fisl.softwarelivre.org/papers/pub/programacao/360">Encontro Javali: Escape the Java Trap: GNU Classpath and Kaffe</a>
+Dalibor Topic and Mark Wielaard
+(<a href="http://www.klomp.org/mark/classpath/GNUClasspathKaffe/">slides</a>)</li>
+</ul>
+<p>
+<li>
+[22-25 Jun 2005] <a href="http://www.linuxtag.org/">LinuxTag</a>, Karlsruhe - Germany
+<ul>
+<li><a href="http://www.linuxtag.org/vcc/details.pl?id=162">GNU Classpath</a>
+Robert Schuster (in German)
+(<a href="http://www.inf.fu-berlin.de/%7Erschuste/GNUClasspath-LinuxTag2005-English.pdf">slides</a>)</li>
+<li><a href="http://www.linuxtag.org/vcc/details.pl?id=166">GCJ and Classpath: A Free Implementation of the Java programming language</a>
+Andrew Haley (in English)
+(<a href="http://people.redhat.com/~aph/linuxtag.tar.gz">slides</a>)</li>
+</ul>
+<p>
+<li>[26+27 Feb. 2005] FOSDEM'05 in Brussels, Belgium. [<createlink name="Escape The Java Trap!" url="events/escape_fosdem05.html">]
+<p>
 <li>[21+22 Feb. 2004] FOSDEM'04 in Brussels, Belgium. [<createlink name="report" url="events/fosdem04.html">]
+<p>
 <li>[14+15 Oct. 2003] Linux Kongress '03 in Saarbr&uuml;cken, Germany.
+<ul>
+<li>Hacking on the VM Interface: GNU Classpath workshop, Mark Wielaard
+(<a href="http://www.klomp.org/mark/classpath/slides/gnu_classpath_workshop.html">slides</a>).
+<li>Agile2D: implementing Graphics2D over OpenGL, Jean-Daniel Fekete
+(<a href="http://www.klomp.org/mark/classpath/Agile2D.pdf">slides</a>).
+</ul>
+
 </ul>
 <br><br><br>
 </boxitem>
diff --git a/libjava/classpath/doc/www.gnu.org/faq/faq.wml b/libjava/classpath/doc/www.gnu.org/faq/faq.wml
index 25c6dd1..67ae91f 100644
--- a/libjava/classpath/doc/www.gnu.org/faq/faq.wml
+++ b/libjava/classpath/doc/www.gnu.org/faq/faq.wml
@@ -304,6 +304,28 @@ be a bit picky about getting signatures from all contributors. Please do
 not see this as a personal offence.
 
 <p>Giving the copyright to the FSF also gives us a clear paper trail where changes come from, which confirms our clean-room status.
+</p>
+
+<p>
+The assignment contract commits the foundation to setting distribution terms
+that permit free redistribution.
+</p>
+
+<p>
+The assignment contract we normally use has a clause that permits you to
+use your code in proprietary programs, on 30 days' notice.
+(The 30 days' notice is there because, through a legal technicality,
+it would improve our position in a suit against a hoarder.)
+Although we believe that proprietary software is wrong, we include this
+clause because it would serve no purpose to ask you to promise not to do
+it. You're giving us a gift in the first place.
+</p>
+
+<p>
+You don't need to invoke this clause in order to distribute
+copies as free software under the GNU GPL, since everyone is
+allowed to do that.
+</p>
 
 <p>See also <a href="http://www.gnu.org/licenses/why-assign.html">http://www.gnu.org/licenses/why-assign.html</a>.
 </p>
diff --git a/libjava/classpath/doc/www.gnu.org/include/layout.wml b/libjava/classpath/doc/www.gnu.org/include/layout.wml
index 61cf0bc..a828492 100644
--- a/libjava/classpath/doc/www.gnu.org/include/layout.wml
+++ b/libjava/classpath/doc/www.gnu.org/include/layout.wml
@@ -105,7 +105,7 @@
 
 <menutitle>Savannah</menutitle>
 <menuitem><createlink name="Project Home" url="http://savannah.gnu.org/projects/classpath/"></menuitem>
-<menuitem><createlink name="Bug Reports" url="http://savannah.gnu.org/bugs/?group=classpath"></menuitem>
+<menuitem><createlink name="Bug Reports" url="bugs.html"></menuitem>
 <!--
 <menuitem><createlink name="Support" url="http://savannah.gnu.org/support/?group=classpath"></menuitem>
 <menuitem><createlink name="Patches" url="http://savannah.gnu.org/patch/?group=classpath"></menuitem>
diff --git a/libjava/classpath/doc/www.gnu.org/newsitems.txt b/libjava/classpath/doc/www.gnu.org/newsitems.txt
index 815a60f..b4976df 100644
--- a/libjava/classpath/doc/www.gnu.org/newsitems.txt
+++ b/libjava/classpath/doc/www.gnu.org/newsitems.txt
@@ -1,3 +1,13 @@
+<newsitem date="03 Aug 2005">
+<createlink name="Generics Branch Merge Announcement"
+            url="http://lists.gnu.org/archive/html/classpath/2005-08/msg00002.html">
+</newsitem>
+
+<newsitem date="01 Aug 2005">
+<createlink name="Bugs moved to bugzilla"
+            url="bugs.html">
+</newsitem>
+
 <newsitem date="15 Jul 2005">
 <createlink name="GNU Classpath 0.17"
             url="announce/20050715.html">