From fad690046d1ddc101a7cad303cb08cbb201fbbe3 Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sat, 9 Jan 2010 05:21:49 +0000
Subject: [PATCH] Based on my reading of Sun licensing documentation*, add
 OpenJDK as a Sun trademark.

http://www.sun.com/software/opensource/java/faq.jsp#j5
---
 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 aa1cb27e3f..fad8d607da 100644
--- a/share/sgml/trademarks.ent
+++ b/share/sgml/trademarks.ent
@@ -328,7 +328,7 @@ Coverity, Inc.</para>">
 <!-- http://www.sun.com/suntrademarks/ -->
 
 <!ENTITY tm-attrib.sun "<para>Sun, Sun Microsystems, Java, Java
-  Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra,
+  Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK,
   Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS,
   Ultra and VirtualBox are trademarks or registered trademarks of
   Sun Microsystems, Inc. in the United States and other countries.</para>">
@@ -340,6 +340,7 @@ Coverity, Inc.</para>">
 <!ENTITY jsp "<trademark>JSP</trademark>">
 <!ENTITY jvm "<trademark>JVM</trademark>">
 <!ENTITY netra "<trademark>Netra</trademark>">
+<!ENTITY openjdk "<trademark>OpenJDK</trademark>">
 <!ENTITY solaris "<trademark>Solaris</trademark>">
 <!ENTITY staroffice "<trademark>StarOffice</trademark>">
 <!ENTITY sun "<trademark>Sun</trademark>">