Author: mmcallis Date: 2008-06-11 21:15:07 -0400 (Wed, 11 Jun 2008) New Revision: 10994 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/identityportlets.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml Log: fixing trademarks for JavaServer. Removing all symbols, apart from the trademark page, and the first use of JavaServer (for Faces and Pages) Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml 2008-06-11 19:12:39 UTC (rev 10993) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml 2008-06-12 01:15:07 UTC (rev 10994) @@ -209,7 +209,7 @@ <listitem> <para>Form GET are not handled, however it should not be an issue as this situation is discouraged by the Portlet specification. It however taken in account, just in case of. Here is an example - of a <trademark class="trade">JavaServer</trademark> Page that would do one:</para> + of a JavaServer Page that would do one:</para> <programlisting><![CDATA[ <form action="<%= renderResponse.createActionURL() %>" method="get"> ... Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-06-11 19:12:39 UTC (rev 10993) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-06-12 01:15:07 UTC (rev 10994) @@ -383,7 +383,7 @@ <para> <note> <title><trademark class="trade">JSP</trademark> Location</title> - The <trademark class="trade">JavaServer</trademark> Pages must be located in the <filename>jboss-portal.sar/portal-core.war/</filename> web application. + The JavaServer Pages must be located in the <filename>jboss-portal.sar/portal-core.war/</filename> web application. </note> </para> </sect1> Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/identityportlets.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/identityportlets.xml 2008-06-11 19:12:39 UTC (rev 10993) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/identityportlets.xml 2008-06-12 01:15:07 UTC (rev 10994) @@ -383,7 +383,7 @@ </itemizedlist> </para> <note> - This is not a <trademark class="trade">JavaServer</trademark> Faces tutorial. Basic knowledge of + This is not a JavaServer Faces tutorial. Basic knowledge of this technology is a precondition for customizing the User Portlet Interface. </note> 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-11 19:12:39 UTC (rev 10993) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-06-12 01:15:07 UTC (rev 10994) @@ -148,7 +148,7 @@ <sect3> <title>Package Structure</title> <para> - Like other Java Platform, Enterprise Edition (Java EE) applications, portlets are packaged in WAR files. A typical portlet WAR file can include servlets, resource bundles, images, HTML, <trademark class="trade">JSP</trademark>, and other static or dynamic files. The following is an example of the directory structure of the HelloWorldPortlet portlet: + Like other Java Platform, Enterprise Edition (Java EE) applications, portlets are packaged in WAR files. A typical portlet WAR file can include servlets, resource bundles, images, HTML, <trademark class="trade">JavaServer</trademark> Pages (<trademark class="trade">JSP</trademark>), and other static or dynamic files. The following is an example of the directory structure of the HelloWorldPortlet portlet: </para> <para> <mediaobject>