os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Based on my reading of Sun licensing documentation*, add OpenJDK as

Browse source 
a Sun trademark.

http://www.sun.com/software/opensource/java/faq.jsp#j5
This commit is contained in:
Mark Linimon 2010-01-09 05:21:49 +00:00
parent 8fb8a16022
commit fad690046d
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=35159
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
share/sgml/trademarks.ent
View file

@ -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>">