Author: mmcallis Date: 2008-06-13 00:58:09 -0400 (Fri, 13 Jun 2008) New Revision: 11017 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml Log: trademark symbols for J2EE Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml 2008-06-13 02:53:31 UTC (rev 11016) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/security.xml 2008-06-13 04:58:09 UTC (rev 11017) @@ -359,7 +359,7 @@ <sect1 id="security_authorization"> <title>Authorization with JBoss Portal</title> <para>JBoss Portal defines a framework for authorization. The default implementation of that framework is based on - the Java Authorization Contract for Containers (JACC) which is implemented by J2EE 1.4 Application Servers. This section of + the Java Authorization Contract for Containers (JACC) which is implemented by <trademark class="trade">J2EE</trademark> 1.4 Application Servers. This section of the documentation focuses on defining the framework and its usage and is not an attempt to define what authorization is or is not because it is out of scope of this context. Instead we will try to straightforwardly describe the framework and how it is used. No specific knowledge is expected about JACC although it is a recommended read.</para> 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-13 02:53:31 UTC (rev 11016) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-13 04:58:09 UTC (rev 11017) @@ -1,7 +1,7 @@ <preface id="trademarks"> <title>Please Read: Important Trademark Information</title> <para> - JavaServer, JSP, Java, JMX, JDK, 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. + JavaServer, JSP, Java, JMX, JDK, Java runtime environment, 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.