Author: mmcallis Date: 2008-06-10 19:15:35 -0400 (Tue, 10 Jun 2008) New Revision: 10976 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml Log: Spoke with Red Hat legal: - fixing attribution statements. - adding attribution statements. Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-10 21:19:03 UTC (rev 10975) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-10 23:15:35 UTC (rev 10976) @@ -1,13 +1,13 @@ <preface id="trademarks"> <title>Please Read: Important Trademark Information</title> <para> - JavaServer, JSP, Java, Java runtime environment, JRE, J2EE, JVM, Javadoc, JavaScript, and J2SE are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. Red Hat, Inc. is independent of Sun Microsystems, Inc. + JavaServer, JSP, Java, Java runtime environment, JRE, J2EE, JVM, Javadoc, JavaScript, and J2SE are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. </para> <para> JBoss is a registered trademark of Red Hat, Inc. in the U.S. and other countries. </para> <para> - Oracle is a registered trademark of Oracle Corporation and/or its affiliates. Other names may be trademarks of their respective owners. + Oracle is a registered trademark of Oracle International Corporation. </para> <para> Microsoft, Windows, and SQL Server are either registered trademarks or trademarks of Microsoft Corporation in the United States and/or other countries. @@ -16,8 +16,20 @@ Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries. </para> <para> - Other product and company names mentioned herein may be the trademarks of their respective owners. + UNIX is a registered trademark of The Open Group. </para> + <para> + MySQL is a trademark or registered trademark of MySQL AB in the U.S. and other countries. + </para> + <para> + Apache is a trademark of The Apache Software Foundation. + </para> + <para> + Mac and Mac OS are trademarks of Apple Inc., registered in the U.S. and other countries. + </para> + <para> + All other trademarks referenced herein are the property of their respective owners. + </para> </preface>