diff --git a/share/xml/trademarks.ent b/share/xml/trademarks.ent index 5fe2a3bf2a..fc10f50f0e 100644 --- a/share/xml/trademarks.ent +++ b/share/xml/trademarks.ent @@ -26,13 +26,14 @@ Adaptec, Inc."> Adaptec"> -Adobe, Acrobat, Acrobat Reader, and +Adobe, Acrobat, Acrobat Reader, Flash and PostScript are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries."> Acrobat"> Acrobat Reader"> Adobe"> +Flash"> PostScript"> @@ -208,12 +209,12 @@ Coverity, Inc."> MegaRAID"> Mylex"> + Macromedia, Flash, and Shockwave are trademarks or registered trademarks of Macromedia, Inc. in the United States and/or other countries."> -Flash"> Macromedia"> -Shockwave"> Microsoft, IntelliMouse, MS-DOS, Outlook, Windows, Windows Media and Windows NT are either @@ -257,6 +258,8 @@ Coverity, Inc."> Netscape"> Netscape Navigator"> + GateD and NextHop are registered and unregistered trademarks of NextHop in the U.S. and other @@ -309,6 +312,8 @@ Coverity, Inc."> registered trademarks of Red Hat, Inc. in the United States and other countries."> + SAP, R/3, and mySAP are trademarks or registered trademarks of SAP AG in Germany and in several other countries all over the world."> @@ -326,18 +331,16 @@ Coverity, Inc."> of Patrick Volkerding and Slackware Linux, Inc."> -SPARC, SPARC64, SPARCengine, and +SPARC, SPARC64, and UltraSPARC are trademarks of SPARC International, Inc in the United States and other countries. SPARC International, Inc owns all of the SPARC trademarks and under licensing agreements allows the proper use of these trademarks by its members."> SPARC"> SPARC64"> -SPARCengine"> UltraSPARC"> - Sun, Sun Microsystems, Java, Java Virtual Machine, JavaServer Pages, JDK, JRE, JSP, JVM, Netra, OpenJDK, Solaris, StarOffice, Sun Blade, Sun Enterprise, Sun Fire, SunOS, @@ -466,6 +469,8 @@ Coverity, Inc."> '> +