Author: mmcallis Date: 2008-06-17 23:56:01 -0400 (Tue, 17 Jun 2008) New Revision: 11075 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml Log: - minor fixes - trademarks for "100% Pure Java" Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-06-18 03:39:00 UTC (rev 11074) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-06-18 03:56:01 UTC (rev 11075) @@ -31,7 +31,7 @@ </sect1> <sect1> <title>Supported Operating Systems</title> - <para>JBoss Portal is 100% pure <trademark class="trade">Java</trademark> technology, and therefore it is interoperable with most operating systems + <para>JBoss Portal is <trademark class="trade">100% Pure Java</trademark>, and therefore it is interoperable with most operating systems capable of running a Java Virtual Machine (<trademark class="trade">JVM</trademark>), including <trademark class="registered">Linux</trademark>, <trademark class="registered">Windows</trademark>, <trademark class="registered">UNIX</trademark> operating systems, and Mac OS X. </para> </sect1> 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-18 03:39:00 UTC (rev 11074) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-18 03:56:01 UTC (rev 11075) @@ -1,7 +1,7 @@ <preface id="trademarks"> <title>Please Read: Important Trademark Information</title> <para> - JavaServer, JSP, Java, JMX, JDK, Java runtime environment, J2EE, JVM, Javadoc, and JavaScript are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. + JavaServer, JSP, Java, JMX, JDK, Java runtime environment, J2EE, JVM, Javadoc, 100% Pure Java, and JavaScript 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.