From 5466f6bd9b19cbf05deb9563fb84f1d8a2bc9d77 Mon Sep 17 00:00:00 2001 From: "Simon L. B. Nielsen" Date: Sun, 16 Jul 2006 11:54:01 +0000 Subject: [PATCH] - Add JRE to Sun's trademark attribution. - Add link to Sun's trademark page. --- share/sgml/trademarks.ent | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/sgml/trademarks.ent b/share/sgml/trademarks.ent index 787b8bc4cb..97dd08a9ff 100644 --- a/share/sgml/trademarks.ent +++ b/share/sgml/trademarks.ent @@ -298,7 +298,8 @@ SPARCEngine"> UltraSPARC"> -Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JSP, JVM, Netra, Solaris, StarOffice, + +Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, and Ultra are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries.">