Author: mmcallis Date: 2008-06-18 00:14:58 -0400 (Wed, 18 Jun 2008) New Revision: 11076 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml Log: trademark marks for "Sun". This should finish all Sun trademarks... 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:56:01 UTC (rev 11075) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-18 04:14:58 UTC (rev 11076) @@ -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, 100% Pure Java, and JavaScript are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. + Sun, 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. Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-06-18 03:56:01 UTC (rev 11075) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-06-18 04:14:58 UTC (rev 11076) @@ -996,7 +996,7 @@ </sect3> </sect2> <sect2 id="sunri_42x"> - <title>An example Sun JSF Reference Implementation (RI) portlet</title> + <title>An example <trademark class="trade">Sun</trademark> JSF Reference Implementation (RI) portlet</title> <sect3> <title>Introduction</title> <para> @@ -1020,9 +1020,9 @@ </para> <para> <note> - <title>Bundled Sun JSF RI</title> + <title>Bundled <trademark class="trade">Sun</trademark> JSF RI</title> <para> - JBoss AS version 4.2.<replaceable>x</replaceable> and JBoss EAP bundle Sun's JSF RI libraries in the + JBoss AS version 4.2.<replaceable>x</replaceable> and JBoss EAP bundle the <trademark class="trade">Sun</trademark> JSF RI libraries in the <filename>$JBOSS_HOME/server/default/deploy/jboss-web.deployer/jsf-libs/</filename> directory. Therefore, you do not need to package the Sun JSF RI libraries with your portlet application. </para> </note>