Author: mmcallis Date: 2008-06-10 00:04:49 -0400 (Tue, 10 Jun 2008) New Revision: 10968 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml 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 Log: - fixing trademarks - new master file to include trademark page Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml 2008-06-10 01:54:23 UTC (rev 10967) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml 2008-06-10 04:04:49 UTC (rev 10968) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" "../../docbook-support/support/docbook-dtd/docbookx.dtd" [ + <!ENTITY trademarks SYSTEM "modules/trademarks.xml"> <!ENTITY overview SYSTEM "../../common/en/modules/overview.xml"> <!ENTITY featurelist SYSTEM "../../common/en/modules/featurelist.xml"> <!ENTITY target SYSTEM "modules/target.xml"> @@ -68,6 +69,7 @@ </author> </bookinfo> <toc/> + <!-- Trademark - Trying to make all vendor legal teams happy --> &trademarks; <!-- Portal overview - marketing stuff --> &overview; <!-- Comprehensive list of included features --> &featurelist; <!-- Target audience of this document --> &target; 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-10 01:54:23 UTC (rev 10967) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml 2008-06-10 04:04:49 UTC (rev 10968) @@ -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 JavaServer Page that would do one:</para> + of a <trademark class="trade">JavaServer</trademark> 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-10 01:54:23 UTC (rev 10967) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-06-10 04:04:49 UTC (rev 10968) @@ -343,9 +343,9 @@ </sect2> </sect1> <sect1> - <title>Handling Errors with JavaServer Pages (JSP)</title> + <title>Handling Errors with <trademark class="trade">JavaServer</trademark> Pages (<trademark class="trade">JSP</trademark>)</title> <para> - As described in previous sections, error handling can be redirected to a JSP. Two pages can be created to handle errors, one for the portal level, and the other for the page level. Portal level error-handling requires a page that produces a full page, and page-level handling requires a page that produces markup, but only for a window. When the page is invoked, a set of request attributes are passed. The following table represents possible request attributes: + As described in previous sections, error handling can be redirected to a <trademark class="trade">JSP</trademark>. Two pages can be created to handle errors, one for the portal level, and the other for the page level. Portal level error-handling requires a page that produces a full page, and page-level handling requires a page that produces markup, but only for a window. When the page is invoked, a set of request attributes are passed. The following table represents possible request attributes: </para> <para> <table frame="all"> @@ -382,8 +382,8 @@ </para> <para> <note> - <title>JSP Location</title> - The JavaServer Pages must be located in the <filename>jboss-portal.sar/portal-core.war/</filename> web application. + <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. </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-10 01:54:23 UTC (rev 10967) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/identityportlets.xml 2008-06-10 04:04:49 UTC (rev 10968) @@ -383,7 +383,7 @@ </itemizedlist> </para> <note> - This is not a JavaServer Faces tutorial. Basic knowledge of + This is not a <trademark class="trade">JavaServer</trademark> Faces tutorial. Basic knowledge of this technology is a precondition for customizing the User Portlet Interface. </note>