Author: mmcallis Date: 2008-06-05 21:18:16 -0400 (Thu, 05 Jun 2008) New Revision: 10931 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml Log: finishing Sun trademark section 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-06 01:05:45 UTC (rev 10930) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-06 01:18:16 UTC (rev 10931) @@ -1,16 +1,14 @@ <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. + </para> </preface> -To do: +<!--To do: -JavaServer(TM) Page, JSP(TM), Java(TM), Java runtime environment(TM), JRE(TM), J2EE(TM), Java Virtual Machine (JVM(TM)), Javadoc(TM), JavaScript(TM), J2SE(TM), - - - Apache? Linux? @@ -29,4 +27,4 @@ -'Apache is a trademark of The Apache Software Foundation, and is used with permission.' This is not necessary in the case of all-inclusive attribution language such as, 'All marks are the properties of their respective owners.' Contact the ASF Public Relations Committee <prc(a)apache.org&gt; with all inquiries regarding trademark issues \ No newline at end of file +'Apache is a trademark of The Apache Software Foundation, and is used with permission.' This is not necessary in the case of all-inclusive attribution language such as, 'All marks are the properties of their respective owners.' Contact the ASF Public Relations Committee <prc(a)apache.org&gt; with all inquiries regarding trademark issues --> \ No newline at end of file