Author: mmcallis Date: 2008-06-09 20:17:34 -0400 (Mon, 09 Jun 2008) New Revision: 10962 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml Log: updating trademark section (to be front page), with trademark credits for Sun, JBoss, Oracle, Microsoft, and "Other". Need to work out Linux, UNIX, Apache, and Red Hat. Will mail Legal 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-09 12:40:39 UTC (rev 10961) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-10 00:17:34 UTC (rev 10962) @@ -3,7 +3,18 @@ <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. </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. + </para> + <para> + Microsoft, Windows, and SQL Server are either registered trademarks or trademarks of Microsoft Corporation in the United States and/or other countries. + </para> + <para> + Other product and company names mentioned herein may be the trademarks of their respective owners. + </para> </preface> @@ -16,8 +27,8 @@ All the sun stuff -Oracle covered...(but check) + Microsoft?