[gatein-commits] gatein SVN: r3032 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US: modules and 8 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon May 10 18:39:09 EDT 2010


Author: smumford
Date: 2010-05-10 18:39:07 -0400 (Mon, 10 May 2010)
New Revision: 3032

Modified:
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Author_Group.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Feedback.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/Foundations.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/architecture.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/intro.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/AccessingUserProfile.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Configuration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Introduction.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/JavascriptInterApplicationCommunication.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/overview.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml
   portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/WSRP.xml
Log:
JBEPP-276: Checking in broken version for Publican troubleshooting

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Author_Group.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Author_Group.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Author_Group.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -23,6 +23,15 @@
 		<email>theute at redhat.com</email>
 	</editor>
 	<editor>
+		<firstname>Wesley</firstname>
+		<surname>Hales</surname>
+		<affiliation>
+			<shortaffil>Red Hat</shortaffil>
+			<orgdiv></orgdiv>
+		</affiliation>
+		<email>whales at redhat.com</email>
+	</editor>
+	<editor>
 		<firstname>Scott</firstname>
 		<surname>Mumford</surname>
 		<affiliation>
@@ -36,7 +45,7 @@
 			<orgname><emphasis role="bold"><ulink type="http" url="http://www.jboss.org/gatein/">GateIn</ulink></emphasis> and <emphasis role="bold"><ulink type="http" url="http://www.exoplatform.com/portal/public/website/">Exo Platform</ulink></emphasis></orgname>
 			<orgdiv>Documentation Teams</orgdiv>
 		</affiliation>
-		<contrib>Original product documentation by:</contrib>
+		<contrib>Based on original product documentation by:</contrib>
 	</othercredit>
 </authorgroup>
 

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Feedback.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Feedback.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Feedback.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -10,7 +10,7 @@
 		<secondary>contact information for this manual</secondary>
 	</indexterm>
 	<para>
-		If you find a typographical error in this manual, or if you have thought of a way to make this manual better, we would love to hear from you! Please submit a report in Bugzilla: <ulink url="http://bugzilla.redhat.com/bugzilla/">http://bugzilla.redhat.com/bugzilla/</ulink> against the product <application>&PRODUCT;.</application>
+		If you find a typographical error in this manual, or if you have thought of a way to make this manual better, we would love to hear from you! Please submit a report in Bugzilla: <ulink url="http://bugzilla.redhat.com/bugzilla/">http://bugzilla.redhat.com/bugzilla/</ulink> against the product <application>&PRODUCT;</application>.
 	</para>
 	<para>
 		When submitting a bug report, be sure to mention the manual's identifier: <citetitle>&BOOKID;</citetitle>

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/Foundations.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/Foundations.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/Foundations.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Foundations">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/architecture.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/architecture.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/architecture.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Basic_concepts_of_eXoJCR">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Configuring_JBoss_AS_with_eXo_JCR_in_cluster">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-JCR_Configuration_persister">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-eXo_JCR_configuration">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-External_Value_Storages">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/intro.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/intro.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/intro.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Introduction_in_eXoJCR">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-JBoss_Cache_configuration">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-JBossTransactionsService">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-JDBC_Data_Container_Config">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-LockManager_configuration">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Multilanguage_support_in_eXo_JCR_RDB_backend">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-QueryHandler_configuration">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Search_Configuration">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-eXo_JCR_statistics">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-TransactionManagerLookup">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-eXoJCR">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <part id="part-Reference_Guide-Advanced_Development">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/AccessingUserProfile.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/AccessingUserProfile.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/AccessingUserProfile.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Accessing_User_Profile">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationTokenConfiguration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Authentication_Token_Configuration">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-PicketLink_IDM_integration">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Organization_API">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Predefined_User_Configuration">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-SSO_Single_Sign_On">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Authentication_and_Identity">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Database_Configuration">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-E_Mail_Service_Configuration">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Configuration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Configuration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Configuration">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Gadgets">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Setup_a_Gadget_Server">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Gadget_development">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Introduction.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Introduction.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Introduction.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Introduction">
@@ -38,7 +38,7 @@
 						</para>
 						<mediaobject>
 							<imageobject role="html">
-								<imagedata fileref="images/Common/Non-tech-docs.png" format="PNG" align="center" scale="100" />
+								<imagedata fileref="images/Common/Non-tech-docs.png" format="PNG" align="center" scale="90" />
 							</imageobject>
 							<imageobject role="fo">
 								<imagedata fileref="images/Common/Non-tech-docs.png" format="PNG" align="center" contentwidth="150mm" />
@@ -54,7 +54,7 @@
 					</para>
 					<mediaobject>
 						<imageobject role="html">
-							<imagedata fileref="images/Common/Videos.png" format="PNG" align="center" scale="100" />
+							<imagedata fileref="images/Common/Videos.png" format="PNG" align="center" scale="90" />
 						</imageobject>
 						<imageobject role="fo">
 							<imagedata fileref="images/Common/Videos.png" format="PNG" align="center" contentwidth="150mm" />

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Default_Portal_Configuration">
@@ -8,10 +8,10 @@
 	<section id="sect-Reference_Guide-Default_Portal_Configuration-Overview">
 		<title>Overview</title>
 		<para>
-			&PRODUCT; default home page URL is <literal>http://{hostname}:{port}/portal/</literal>. There may be multiple independent portals deployed in parallel at any given time, each of which has its root context (i.e.: <literal>http://{hostname}:{port}/sample-portal/</literal>).
+			&PRODUCT;'s default home page URL is <literal>http://{hostname}:{port}/portal/</literal>. There may be multiple independent portals deployed in parallel at any given time, each of which has its root context (i.e.: <literal>http://{hostname}:{port}/sample-portal/</literal>).
 		</para>
 		<para>
-			Each portal is internally composed of one or more 'portals'. This is because there needs to be at least one such portal available. The default one is called 'classic'. When accessing &PRODUCT;'s default home page URL, you are automatically directed to the 'classic' portal.
+			Each portal is internally composed of one or more 'portals'. This is because there needs to be at least one such portal available. The default portal is called '<emphasis>Classic</emphasis>'. When accessing &PRODUCT;'s default URL, you are automatically directed to the '<emphasis>Classic</emphasis>' portal.
 		</para>
 		<para>
 			 The default portal performs another important task. When starting up &PRODUCT; for the first time, its JCR database (where portal runtime-configurable settings are stored) will be empty . The default portal detects this and triggers automatic data initialization.
@@ -24,32 +24,31 @@
 			The following example configuration can be found at: "<filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename>".
 		</para>
 		
-<programlisting role="XML">&lt;component&gt;
-    &lt;key&gt;org.exoplatform.portal.config.UserPortalConfigService&lt;/key&gt;
-    &lt;type&gt;org.exoplatform.portal.config.UserPortalConfigService&lt;/type&gt;
-    &lt;component-plugins&gt;           
-     &lt;component-plugin&gt;
-       &lt;name&gt;new.portal.config.user.listener&lt;/name&gt;
-       &lt;set-method&gt;initListener&lt;/set-method&gt;
-       &lt;type&gt;org.exoplatform.portal.config.NewPortalConfigListener&lt;/type&gt;
-       &lt;description&gt;this listener init the portal configuration&lt;/description&gt;
-       &lt;init-params&gt;
-         &lt;value-param&gt;
-           &lt;name&gt;default.portal&lt;/name&gt;
-           &lt;description&gt;The default portal for checking db is empty or not&lt;/description&gt;
-           &lt;value&gt;classic&lt;/value&gt;
-         &lt;/value-param&gt; 
+<programlisting language="XML" role="XML"><![CDATA[<component>
+    <key>org.exoplatform.portal.config.UserPortalConfigService</key>
+    <type>org.exoplatform.portal.config.UserPortalConfigService</type>
+    <component-plugins>           
+     <component-plugin>
+       <name>new.portal.config.user.listener</name>
+       <set-method>initListener</set-method>
+       <type>org.exoplatform.portal.config.NewPortalConfigListener</type>
+       <description>this listener init the portal configuration</description>
+       <init-params>
+         <value-param>
+           <name>default.portal</name>
+           <description>The default portal for checking db is empty or not</description>
+           <value>classic</value>
+         </value-param> 
          ...
-       &lt;/init-params&gt;
-     &lt;/component-plugin&gt;
-    &lt;/component-plugins&gt; 
-  &lt;/component&gt;
-</programlisting>
+       </init-params>
+     </component-plugin>
+    </component-plugins> 
+  </component>]]></programlisting>
 		<para>
-			In this example the <emphasis role="bold">classic</emphasis> portal has been set as the default.
+			In this example the <emphasis>Classic</emphasis> portal has been set as the default.
 		</para>
 		<para>
-			Notice that the <literal>NewPortalConfigListener</literal> <emphasis>component-plugin</emphasis> is used to add configuration to <literal>UserPortalConfigService</literal>, which is designed in this way to allow other components to add configuration to it.
+			Notice that the <literal>NewPortalConfigListener</literal> <parameter>component-plugin</parameter> is used to add configuration to <literal>UserPortalConfigService</literal>, which is designed in this way to allow other components to add configuration to it.
 		</para>
 		<para>
 				<emphasis>Components</emphasis>, <emphasis>component-plugins</emphasis>, and <emphasis>init-params</emphasis> are explained in a later chapter of this document.

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Portal_Navigation_Configuration">
@@ -30,72 +30,72 @@
 		<para>
 			These navigations are configured using standard XML syntax in the file; "<filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename>".
 		</para>
-		
-<programlisting role="XML">&lt;component&gt;
-  &lt;key&gt;org.exoplatform.portal.config.UserPortalConfigService&lt;/key&gt;
-  &lt;type&gt;org.exoplatform.portal.config.UserPortalConfigService&lt;/type&gt;
-  &lt;component-plugins&gt;           
-   &lt;component-plugin&gt;
-     &lt;name&gt;new.portal.config.user.listener&lt;/name&gt;
-     &lt;set-method&gt;initListener&lt;/set-method&gt;
-     &lt;type&gt;org.exoplatform.portal.config.NewPortalConfigListener&lt;/type&gt;
-     &lt;description&gt;this listener init the portal configuration&lt;/description&gt;
-     &lt;init-params&gt;
-       &lt;value-param&gt;
-         &lt;name&gt;default.portal&lt;/name&gt;
-         &lt;description&gt;The default portal for checking db is empty or not&lt;/description&gt;
-         &lt;value&gt;classic&lt;/value&gt;
-       &lt;/value-param&gt; 
-       &lt;object-param&gt;
-         &lt;name&gt;portal.configuration&lt;/name&gt;
-         &lt;description&gt;description&lt;/description&gt;
-         &lt;object type="org.exoplatform.portal.config.NewPortalConfig"&gt;
-           &lt;field  name="predefinedOwner"&gt;
-             &lt;collection type="java.util.HashSet"&gt;                
-               &lt;value&gt;&lt;string&gt;classic&lt;/string&gt;&lt;/value&gt;
-               &lt;value&gt;&lt;string&gt;webos&lt;/string&gt;&lt;/value&gt;
-             &lt;/collection&gt;
-           &lt;/field&gt;
-           &lt;field  name="ownerType"&gt;&lt;string&gt;portal&lt;/string&gt;&lt;/field&gt;
-           &lt;field  name="templateLocation"&gt;&lt;string&gt;war:/conf/portal&lt;/string&gt;&lt;/field&gt; 
-         &lt;/object&gt;
-       &lt;/object-param&gt; 
-       &lt;object-param&gt;
-         &lt;name&gt;group.configuration&lt;/name&gt;
-         &lt;description&gt;description&lt;/description&gt;
-         &lt;object type="org.exoplatform.portal.config.NewPortalConfig"&gt;
-           &lt;field  name="predefinedOwner"&gt;
-             &lt;collection type="java.util.HashSet"&gt;            
-              &lt;value&gt;&lt;string&gt;platform/administrators&lt;/string&gt;&lt;/value&gt;    
-              &lt;value&gt;&lt;string&gt;platform/users&lt;/string&gt;&lt;/value&gt;
-              &lt;value&gt;&lt;string&gt;platform/guests&lt;/string&gt;&lt;/value&gt;
-              &lt;value&gt;&lt;string&gt;organization/management/executive-board&lt;/string&gt;&lt;/value&gt;               
-             &lt;/collection&gt;
-           &lt;/field&gt;
-           &lt;field  name="ownerType"&gt;&lt;string&gt;group&lt;/string&gt;&lt;/field&gt;
-           &lt;field  name="templateLocation"&gt;&lt;string&gt;war:/conf/portal&lt;/string&gt;&lt;/field&gt; 
-         &lt;/object&gt;
-       &lt;/object-param&gt;       
-       &lt;object-param&gt;
-         &lt;name&gt;user.configuration&lt;/name&gt;
-         &lt;description&gt;description&lt;/description&gt;
-         &lt;object type="org.exoplatform.portal.config.NewPortalConfig"&gt;
-           &lt;field  name="predefinedOwner"&gt;
-             &lt;collection type="java.util.HashSet"&gt;                
-               &lt;value&gt;&lt;string&gt;root&lt;/string&gt;&lt;/value&gt;
-               &lt;value&gt;&lt;string&gt;john&lt;/string&gt;&lt;/value&gt;
-               &lt;value&gt;&lt;string&gt;mary&lt;/string&gt;&lt;/value&gt;
-               &lt;value&gt;&lt;string&gt;demo&lt;/string&gt;&lt;/value&gt;
-             &lt;/collection&gt;
-           &lt;/field&gt;
-           &lt;field  name="ownerType"&gt;&lt;string&gt;user&lt;/string&gt;&lt;/field&gt;
-           &lt;field  name="templateLocation"&gt;&lt;string&gt;war:/conf/portal&lt;/string&gt;&lt;/field&gt; 
-         &lt;/object&gt;
-       &lt;/object-param&gt;
-     &lt;/init-params&gt;
-   &lt;/component-plugin&gt;
-&lt;/component-plugins&gt;
-</programlisting>
+
+<programlisting language="XML" role="XML"><![CDATA[<component>
+  <key>org.exoplatform.portal.config.UserPortalConfigService</key>
+  <type>org.exoplatform.portal.config.UserPortalConfigService</type>
+  <component-plugins>           
+   <component-plugin>
+     <name>new.portal.config.user.listener</name>
+     <set-method>initListener</set-method>
+     <type>org.exoplatform.portal.config.NewPortalConfigListener</type>
+     <description>this listener init the portal configuration</description>
+     <init-params>
+       <value-param>
+         <name>default.portal</name>
+         <description>The default portal for checking db is empty or not</description>
+         <value>classic</value>
+       </value-param> 
+       <object-param>
+         <name>portal.configuration</name>
+         <description>description</description>
+         <object type="org.exoplatform.portal.config.NewPortalConfig">
+           <field  name="predefinedOwner">
+             <collection type="java.util.HashSet">                
+               <value><string>classic</string></value>
+               <value><string>webos</string></value>
+             </collection>
+           </field>
+           <field  name="ownerType"><string>portal</string></field>
+           <field  name="templateLocation"><string>war:/conf/portal</string></field> 
+         </object>
+       </object-param> 
+       <object-param>
+         <name>group.configuration</name>
+         <description>description</description>
+         <object type="org.exoplatform.portal.config.NewPortalConfig">
+           <field  name="predefinedOwner">
+             <collection type="java.util.HashSet">            
+              <value><string>platform/administrators</string></value>    
+              <value><string>platform/users</string></value>
+              <value><string>platform/guests</string></value>
+              <value><string>organization/management/executive-board</string></value>               
+             </collection>
+           </field>
+           <field  name="ownerType"><string>group</string></field>
+           <field  name="templateLocation"><string>war:/conf/portal</string></field> 
+         </object>
+       </object-param>       
+       <object-param>
+         <name>user.configuration</name>
+         <description>description</description>
+         <object type="org.exoplatform.portal.config.NewPortalConfig">
+           <field  name="predefinedOwner">
+             <collection type="java.util.HashSet">                
+               <value><string>root</string></value>
+               <value><string>john</string></value>
+               <value><string>mary</string></value>
+               <value><string>demo</string></value>
+             </collection>
+           </field>
+           <field  name="ownerType"><string>user</string></field>
+           <field  name="templateLocation"><string>war:/conf/portal</string></field> 
+         </object>
+       </object-param>
+     </init-params>
+   </component-plugin>
+</component-plugins>]]></programlisting>
+
 		<para>
 			This XML configuration defines where in the portal's <literal>WAR</literal> to look for configuration settings, and which portals, groups, and user specific views to include in portal/group/user navigation.
 		</para>
@@ -107,10 +107,10 @@
 	<section id="sect-Reference_Guide-Portal_Navigation_Configuration-Portal_Navigation">
 		<title>Portal Navigation</title>
 		<para>
-			The portal navigation incorporates the pages that can be accessed even when a user is not logged in (assuming the applicable permissions allow public access). For example; several portal navigations are used when a company owns multiple trademarks, and sets up a web site for each of them.
+			The portal navigation incorporates the pages that can be accessed even when a user is not logged in (assuming the applicable permissions allow public access). For example; several portal navigations could be used when a company has multiple trademarks, and websites are set up for each of them.
 		</para>
 		<para>
-			The <emphasis role="bold">classic</emphasis> portal is configured by four XML files in the <filename>02portal.war:/WEB-INF/conf/portal/portal/classic</filename> directory:
+			The <emphasis>Classic</emphasis> portal is configured by four XML files in the <filename>02portal.war:/WEB-INF/conf/portal/portal/classic</filename> directory:
 		</para>
 		<variablelist>
 			<varlistentry>
@@ -120,41 +120,41 @@
 						This file describes the layout and portlets that will be shown on all pages. Usually the layout contains the banner, footer, menu and breadcrumbs portlets. &PRODUCT; is extremely configurable as every view element (even the banner and footer) is a portlet.
 					</para>
 					
-<programlisting role="XML">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
-&lt;portal-config&gt;
-  &lt;portal-name&gt;classic&lt;/portal-name&gt;
-  &lt;locale&gt;en&lt;/locale&gt;
-  &lt;factory-id&gt;office&lt;/factory-id&gt;
-  &lt;access-permissions&gt;Everyone&lt;/access-permissions&gt;
-  &lt;edit-permission&gt;*:/platform/administrators&lt;/edit-permission&gt;
-  &lt;creator&gt;root&lt;/creator&gt;    
+<programlisting language="XML" role="XML"><![CDATA[<?xml version="1.0" encoding="ISO-8859-1"?>
+<portal-config>
+  <portal-name>classic</portal-name>
+  <locale>en</locale>
+  <factory-id>office</factory-id>
+  <access-permissions>Everyone</access-permissions>
+  <edit-permission>*:/platform/administrators</edit-permission>
+  <creator>root</creator>    
     
-  &lt;portal-layout&gt;   
-  &lt;application&gt;
-     &lt;instance-id&gt;portal#classic:/web/BannerPortlet/banner&lt;/instance-id&gt;
-     &lt;show-info-bar&gt;false&lt;/show-info-bar&gt;
-   &lt;/application&gt;
-   &lt;application&gt;
-    &lt;instance-id&gt;portal#classic:/web/NavigationPortlet/toolbar&lt;/instance-id&gt;
-     &lt;show-info-bar&gt;false&lt;/show-info-bar&gt;
-   &lt;/application&gt;
+  <portal-layout>   
+  <application>
+     <instance-id>portal#classic:/web/BannerPortlet/banner</instance-id>
+     <show-info-bar>false</show-info-bar>
+   </application>
+   <application>
+    <instance-id>portal#classic:/web/NavigationPortlet/toolbar</instance-id>
+     <show-info-bar>false</show-info-bar>
+   </application>
   
-   &lt;application&gt;
-     &lt;instance-id&gt;portal#classic:/web/BreadcumbsPortlet/breadcumbs&lt;/instance-id&gt;
-     &lt;show-info-bar&gt;false&lt;/show-info-bar&gt;
-   &lt;/application&gt;
+   <application>
+     <instance-id>portal#classic:/web/BreadcumbsPortlet/breadcumbs</instance-id>
+     <show-info-bar>false</show-info-bar>
+   </application>
    
  
-   &lt;page-body&gt; &lt;/page-body&gt;
+   <page-body> </page-body>
    
-   &lt;application&gt;
-     &lt;instance-id&gt;portal#classic:/web/FooterPortlet/footer&lt;/instance-id&gt;
-     &lt;show-info-bar&gt;false&lt;/show-info-bar&gt;
-   &lt;/application&gt;
-  &lt;/portal-layout&gt;
+   <application>
+     <instance-id>portal#classic:/web/FooterPortlet/footer</instance-id>
+     <show-info-bar>false</show-info-bar>
+   </application>
+  </portal-layout>
   
-&lt;/portal-config&gt;
-</programlisting>
+</portal-config>]]></programlisting>
+
 					<para>
 						It is also possible to apply a nested container that can also contain portlets. Row, column or tab containers are then responsible for the layout of their child portlets.
 					</para>
@@ -165,7 +165,7 @@
 						Use the <literal>page-body</literal> tag to define where &PRODUCT; should render the current page.
 					</para>
 					<para>
-						The defined <emphasis role="bold">classic</emphasis> portal is accessible to "Everyone" (at <literal>/portal/public/classic</literal>) but only members of the group <literal>/platform/administrators</literal> can edit it.
+						The defined <emphasis>classic</emphasis> portal is accessible to "Everyone" (at <literal>/portal/public/classic</literal>) but only members of the group <literal>/platform/administrators</literal> can edit it.
 					</para>
 				</listitem>
 			</varlistentry>
@@ -179,27 +179,26 @@
 						When the <literal>#{...}</literal> syntax is used, the enclosed property name serves as a key that is automatically passed to internationalization mechanism so the literal property name is replaced by a localized value taken from the associated properties file matching the current locale.
 					</para>
 					
-<programlisting role="XML">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;node-navigation&gt;
-  &lt;owner-type&gt;portal&lt;/owner-type&gt;
-  &lt;owner-id&gt;classic&lt;/owner-id&gt;
-  &lt;priority&gt;1&lt;/priority&gt;
-  &lt;page-nodes&gt;
-   &lt;node&gt;
-     &lt;uri&gt;home&lt;/uri&gt;
-     &lt;name&gt;home&lt;/name&gt;
-     &lt;label&gt;#{portal.classic.home}&lt;/label&gt;
-     &lt;page-reference&gt;portal::classic::homepage&lt;/page-reference&gt;     
-   &lt;/node&gt;    
-   &lt;node&gt;
-     &lt;uri&gt;webexplorer&lt;/uri&gt;
-     &lt;name&gt;webexplorer&lt;/name&gt;
-     &lt;label&gt;#{portal.classic.webexplorer}&lt;/label&gt;
-     &lt;page-reference&gt;portal::classic::webexplorer&lt;/page-reference&gt;     
-   &lt;/node&gt;
-  &lt;/page-nodes&gt;
-&lt;/node-navigation&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<node-navigation>
+  <owner-type>portal</owner-type>
+  <owner-id>classic</owner-id>
+  <priority>1</priority>
+  <page-nodes>
+   <node>
+     <uri>home</uri>
+     <name>home</name>
+     <label>#{portal.classic.home}</label>
+     <page-reference>portal::classic::homepage</page-reference>     
+   </node>    
+   <node>
+     <uri>webexplorer</uri>
+     <name>webexplorer</name>
+     <label>#{portal.classic.webexplorer}</label>
+     <page-reference>portal::classic::webexplorer</page-reference>     
+   </node>
+  </page-nodes>
+</node-navigation>]]></programlisting>
 					<para>
 						This navigation tree can have multiple views inside portlets (such as the breadcrumbs portlet) that render the current view node, the site map or the menu portlets.
 					</para>
@@ -220,41 +219,41 @@
 						This configuration file structure is very similar to <filename>portal.xml</filename> and it can also contain container tags. Each application can decide whether to render the portlet border, the window state, the icons or portlet's mode.
 					</para>
 					
-<programlisting role="XML">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
-&lt;page-set&gt;  
-  &lt;page&gt;
-    &lt;page-id&gt;portal::classic::homepage&lt;/page-id&gt;
-    &lt;owner-type&gt;portal&lt;/owner-type&gt;
-    &lt;owner-id&gt;classic&lt;/owner-id&gt;
-    &lt;name&gt;homepage&lt;/name&gt;
-    &lt;title&gt;Home Page&lt;/title&gt;
-    &lt;access-permissions&gt;Everyone&lt;/access-permissions&gt;
-    &lt;edit-permission&gt;*:/platform/administrators&lt;/edit-permission&gt;
-    &lt;application&gt;
-      &lt;instance-id&gt;portal#classic:/web/HomePagePortlet/homepageportlet&lt;/instance-id&gt;
-      &lt;title&gt;Home Page portlet&lt;/title&gt;
-      &lt;show-info-bar&gt;false&lt;/show-info-bar&gt;
-      &lt;show-application-state&gt;false&lt;/show-application-state&gt;
-      &lt;show-application-mode&gt;false&lt;/show-application-mode&gt;
-    &lt;/application&gt;
-  &lt;/page&gt;    
+<programlisting language="XML" role="XML"><![CDATA[<?xml version="1.0" encoding="ISO-8859-1"?>
+<page-set>  
+  <page>
+    <page-id>portal::classic::homepage</page-id>
+    <owner-type>portal</owner-type>
+    <owner-id>classic</owner-id>
+    <name>homepage</name>
+    <title>Home Page</title>
+    <access-permissions>Everyone</access-permissions>
+    <edit-permission>*:/platform/administrators</edit-permission>
+    <application>
+      <instance-id>portal#classic:/web/HomePagePortlet/homepageportlet</instance-id>
+      <title>Home Page portlet</title>
+      <show-info-bar>false</show-info-bar>
+      <show-application-state>false</show-application-state>
+      <show-application-mode>false</show-application-mode>
+    </application>
+  </page>    
     
-  &lt;page&gt;
-    &lt;page-id&gt;portal::classic::webexplorer&lt;/page-id&gt;
-    &lt;owner-type&gt;portal&lt;/owner-type&gt;
-    &lt;owner-id&gt;classic&lt;/owner-id&gt;
-    &lt;name&gt;webexplorer&lt;/name&gt;
-    &lt;title&gt;Web Explorer&lt;/title&gt;
-    &lt;access-permissions&gt;*:/platform/users&lt;/access-permissions&gt;
-    &lt;edit-permission&gt;*:/platform/administrators&lt;/edit-permission&gt;    
-    &lt;application&gt;
-      &lt;instance-id&gt;group#platform/users:/web/BrowserPortlet/WebExplorer&lt;/instance-id&gt;
-      &lt;title&gt;Web Explorer&lt;/title&gt;
-      &lt;show-info-bar&gt;false&lt;/show-info-bar&gt;
-    &lt;/application&gt;  
-  &lt;/page&gt;  
-&lt;/page-set&gt;
-</programlisting>
+  <page>
+    <page-id>portal::classic::webexplorer</page-id>
+    <owner-type>portal</owner-type>
+    <owner-id>classic</owner-id>
+    <name>webexplorer</name>
+    <title>Web Explorer</title>
+    <access-permissions>*:/platform/users</access-permissions>
+    <edit-permission>*:/platform/administrators</edit-permission>    
+    <application>
+      <instance-id>group#platform/users:/web/BrowserPortlet/WebExplorer</instance-id>
+      <title>Web Explorer</title>
+      <show-info-bar>false</show-info-bar>
+    </application>  
+  </page>  
+</page-set>]]></programlisting>
+
 				</listitem>
 			</varlistentry>
 			<varlistentry>
@@ -264,52 +263,52 @@
 						Porlet instances can be associated with <literal>portlet-preferences</literal> that override the ones defined in <filename>portlet.xml</filename> of the portlet application <literal>war</literal>.
 					</para>
 					
-<programlisting role="XML">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
-&lt;portlet-preferences-set&gt;
-  &lt;portlet-preferences&gt;
-    &lt;owner-type&gt;portal&lt;/owner-type&gt;
-    &lt;owner-id&gt;classic&lt;/owner-id&gt;
-    &lt;window-id&gt;portal#classic:/web/BannerPortlet/banner&lt;/window-id&gt;
-    &lt;preference&gt;
-      &lt;name&gt;template&lt;/name&gt;
-      &lt;value&gt;par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl&lt;/value&gt;
-      &lt;read-only&gt;false&lt;/read-only&gt;
-    &lt;/preference&gt;
-  &lt;/portlet-preferences&gt;
-  &lt;portlet-preferences&gt;
-    &lt;owner-type&gt;portal&lt;/owner-type&gt;
-    &lt;owner-id&gt;classic&lt;/owner-id&gt;
-    &lt;window-id&gt;portal#classic:/web/NavigationPortlet/toolbar&lt;/window-id&gt;
-    &lt;preference&gt;
-      &lt;name&gt;useAJAX&lt;/name&gt;
-      &lt;value&gt;true&lt;/value&gt;
-      &lt;read-only&gt;false&lt;/read-only&gt;
-    &lt;/preference&gt;
-  &lt;/portlet-preferences&gt;
-  &lt;portlet-preferences&gt;
-    &lt;owner-type&gt;portal&lt;/owner-type&gt;
-    &lt;owner-id&gt;classic&lt;/owner-id&gt;
-    &lt;window-id&gt;portal#classic:/web/FooterPortlet/footer&lt;/window-id&gt;
-    &lt;preference&gt;
-      &lt;name&gt;template&lt;/name&gt;
-      &lt;value&gt;par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl&lt;/value&gt;
-      &lt;read-only&gt;false&lt;/read-only&gt;
-    &lt;/preference&gt;
-  &lt;/portlet-preferences&gt;
+<programlisting language="XML" role="XML"><![CDATA[<?xml version="1.0" encoding="ISO-8859-1"?>
+<portlet-preferences-set>
+  <portlet-preferences>
+    <owner-type>portal</owner-type>
+    <owner-id>classic</owner-id>
+    <window-id>portal#classic:/web/BannerPortlet/banner</window-id>
+    <preference>
+      <name>template</name>
+      <value>par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</value>
+      <read-only>false</read-only>
+    </preference>
+  </portlet-preferences>
+  <portlet-preferences>
+    <owner-type>portal</owner-type>
+    <owner-id>classic</owner-id>
+    <window-id>portal#classic:/web/NavigationPortlet/toolbar</window-id>
+    <preference>
+      <name>useAJAX</name>
+      <value>true</value>
+      <read-only>false</read-only>
+    </preference>
+  </portlet-preferences>
+  <portlet-preferences>
+    <owner-type>portal</owner-type>
+    <owner-id>classic</owner-id>
+    <window-id>portal#classic:/web/FooterPortlet/footer</window-id>
+    <preference>
+      <name>template</name>
+      <value>par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl</value>
+      <read-only>false</read-only>
+    </preference>
+  </portlet-preferences>
   
   
-  &lt;portlet-preferences&gt;
-    &lt;owner-type&gt;portal&lt;/owner-type&gt;
-    &lt;owner-id&gt;classic&lt;/owner-id&gt;
-    &lt;window-id&gt;portal#classic:/web/GroovyPortlet/groovyportlet&lt;/window-id&gt;
-    &lt;preference&gt;
-      &lt;name&gt;template&lt;/name&gt;
-      &lt;value&gt;par:/groovy/groovy/webui/component/UIGroovyPortlet.gtmpl&lt;/value&gt;
-      &lt;read-only&gt;false&lt;/read-only&gt;
-    &lt;/preference&gt;
-  &lt;/portlet-preferences&gt;
-&lt;/portlet-preferences-set&gt;
-</programlisting>
+  <portlet-preferences>
+    <owner-type>portal</owner-type>
+    <owner-id>classic</owner-id>
+    <window-id>portal#classic:/web/GroovyPortlet/groovyportlet</window-id>
+    <preference>
+      <name>template</name>
+      <value>par:/groovy/groovy/webui/component/UIGroovyPortlet.gtmpl</value>
+      <read-only>false</read-only>
+    </preference>
+  </portlet-preferences>
+</portlet-preferences-set>]]></programlisting>
+
 				</listitem>
 			</varlistentry>
 		</variablelist>
@@ -506,6 +505,7 @@
 &lt;/portlet-preferences-set&gt;
 </programlisting>
 	</section>   -->
+
 	<section id="sect-Reference_Guide-Portal_Navigation_Configuration-Group_Navigation">
 		<title>Group Navigation</title>
 		<para>
@@ -534,41 +534,41 @@
 			The user's workspace is located at the left hand side of the page and access is restricted to some privileged users, see <xref linkend="sect-Reference_Guide-Predefined_User_Configuration" />
 		</para>
 		
-<programlisting role="XML">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
-&lt;widgets&gt;
-  &lt;owner-type&gt;user&lt;/owner-type&gt;
-  &lt;owner-id&gt;root&lt;/owner-id&gt;
+<programlisting language="XML" role="XML"><![CDATA[<?xml version="1.0" encoding="ISO-8859-1"?>
+<widgets>
+  <owner-type>user</owner-type>
+  <owner-id>root</owner-id>
  
-  &lt;container id="Information"&gt;
-    &lt;name&gt;Information&lt;/name&gt;
-    &lt;description&gt;Information's Description&lt;/description&gt;
-    &lt;application&gt;
-      &lt;instance-id&gt;user#root:/GateInWidgetWeb/WelcomeWidget/WelcomeWidget1&lt;/instance-id&gt;
-      &lt;application-type&gt;GateInWidget&lt;/application-type&gt;
-    &lt;/application&gt;
+  <container id="Information">
+    <name>Information</name>
+    <description>Information's Description</description>
+    <application>
+      <instance-id>user#root:/GateInWidgetWeb/WelcomeWidget/WelcomeWidget1</instance-id>
+      <application-type>GateInWidget</application-type>
+    </application>
       
-    &lt;application&gt;
-      &lt;instance-id&gt;user#root:/GateInWidgetWeb/StickerWidget/StickerWidget&lt;/instance-id&gt;
-      &lt;application-type&gt;GateInWidget&lt;/application-type&gt; 
-    &lt;/application&gt;
+    <application>
+      <instance-id>user#root:/GateInWidgetWeb/StickerWidget/StickerWidget</instance-id>
+      <application-type>GateInWidget</application-type> 
+    </application>
     
-    &lt;application&gt;
-      &lt;instance-id&gt;user#root:/GateInWidgetWeb/InfoWidget/InfoWidget1&lt;/instance-id&gt;
-      &lt;application-type&gt;GateInWidget&lt;/application-type&gt;
-    &lt;/application&gt;
-  &lt;/container&gt;
+    <application>
+      <instance-id>user#root:/GateInWidgetWeb/InfoWidget/InfoWidget1</instance-id>
+      <application-type>GateInWidget</application-type>
+    </application>
+  </container>
   
-  &lt;container id="Calendar"&gt;
-    &lt;name&gt;Calendar&lt;/name&gt;
-    &lt;description&gt;Calendar's Description&lt;/description&gt;
-    &lt;application&gt;
-      &lt;instance-id&gt;user#root:/GateInWidgetWeb/CalendarWidget/CalendarWidget&lt;/instance-id&gt;
-      &lt;application-type&gt;GateInWidget&lt;/application-type&gt; 
-    &lt;/application&gt;
-  &lt;/container&gt; 
+  <container id="Calendar">
+    <name>Calendar</name>
+    <description>Calendar's Description</description>
+    <application>
+      <instance-id>user#root:/GateInWidgetWeb/CalendarWidget/CalendarWidget</instance-id>
+      <application-type>GateInWidget</application-type> 
+    </application>
+  </container> 
  
-&lt;/widgets&gt;
-</programlisting>
+</widgets>]]></programlisting>
+
 		<!--  		<para>
 			Note that when you develop a portal, we advise you to use the XML instead of the User Interface as XML will allow you to provide a preconfigured package to your customer. But as each time you start the server the first time, the XML files are stored in the JCR, it will be necessary to remove the database (the jcr leverages a database). During the development phase using tomcat it simply means to delete the directory: exo-tomcat/temp
 		</para>   -->
@@ -579,7 +579,7 @@
 		<section id="sect-Reference_Guide-Tips-Direct_External_Links">
 			<title>Direct External Links</title>
 			<para>
-				If you wish to add a link to a URL outside the portal you must first define a "page" that will only serve as a navigation placeholder for an external redirect. This page will not be used for any portlets. Then add the URL to the navigation. (TODO: check for correctness)
+				If you wish to add a link to a URL outside the portal you must first define a "page" that will only serve as a navigation placeholder for an external redirect. This page will not be used for any portlets. Then add the URL to the navigation.
 			</para>
 			<variablelist>
 				<varlistentry>
@@ -587,15 +587,14 @@
 					<listitem>
 						<para>
 							
-<programlisting>&lt;page&gt;
-  &lt;owner-type&gt;portal&lt;/owner-type&gt;
-  &lt;owner-id&gt;website&lt;/owner-id&gt;
-  &lt;name&gt;documentation&lt;/name&gt;
-  &lt;title&gt;Documentation&lt;/title&gt;
-  &lt;access-permissions&gt;Everyone&lt;/access-permissions&gt;
-  &lt;edit-permission&gt;*:/platform/administrators&lt;/edit-permission&gt;
-&lt;/page&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<page>
+  <owner-type>portal</owner-type>
+  <owner-id>website</owner-id>
+  <name>documentation</name>
+  <title>Documentation</title>
+  <access-permissions>Everyone</access-permissions>
+  <edit-permission>*:/platform/administrators</edit-permission>
+</page>]]></programlisting>
 						</para>
 					</listitem>
 				</varlistentry>
@@ -604,13 +603,12 @@
 					<listitem>
 						<para>
 							
-<programlisting>&lt;node&gt;
-  &lt;uri&gt;http://wiki.exoplatform.com/xwiki/bin/view/Main/WebHome&lt;/uri&gt;
-  &lt;name&gt;documentation&lt;/name&gt;
-  &lt;label&gt;#{portal.classic.documentation}&lt;/label&gt;
-  &lt;page-reference&gt;portal::website::documentation&lt;/page-reference&gt;
-&lt;/node&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<node>
+  <uri>http://wiki.exoplatform.com/xwiki/bin/view/Main/WebHome</uri>
+  <name>documentation</name>
+  <label>#{portal.classic.documentation}</label>
+  <page-reference>portal::website::documentation</page-reference>
+</node>]]></programlisting>
 						</para>
 					</listitem>
 				</varlistentry>

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Portal_Default_Permission_Configuration">
@@ -8,10 +8,10 @@
 	<section id="sect-Reference_Guide-Portal_Default_Permission_Configuration-Overview">
 		<title>Overview</title>
 		<para>
-			The default permission configuration for the portal is defined through the <literal>org.exoplatform.portal.config.UserACL</literal> component configuration in the file <filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename>.
+			The default permission configuration for the portal is defined through the <literal>org.exoplatform.portal.config.UserACL</literal> component configuration in the <filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename> file.
 		</para>
 		<para>
-			It defines 8 permissions types:
+			It defines eight permissions types:
 		</para>
 		<variablelist>
 			<varlistentry>
@@ -79,40 +79,40 @@
 				</listitem>
 			</varlistentry>
 		</variablelist>
-<programlisting role="XML">&lt;component&gt;
-  &lt;key&gt;org.exoplatform.portal.config.UserACL&lt;/key&gt;
-  &lt;type&gt;org.exoplatform.portal.config.UserACL&lt;/type&gt;   
-  &lt;init-params&gt;      
-    &lt;value-param&gt;
-      &lt;name&gt;super.user&lt;/name&gt;
-      &lt;description&gt;administrator&lt;/description&gt;
-      &lt;value&gt;root&lt;/value&gt;     
-    &lt;/value-param&gt;
+
+<programlisting language="XML" role="XML"><![CDATA[<component>
+  <key>org.exoplatform.portal.config.UserACL</key>
+  <type>org.exoplatform.portal.config.UserACL</type>   
+  <init-params>      
+    <value-param>
+      <name>super.user</name>
+      <description>administrator</description>
+      <value>root</value>     
+    </value-param>
       
-    &lt;value-param&gt;
-      &lt;name&gt;portal.creator.groups&lt;/name&gt;
-      &lt;description&gt;groups with membership type have permission to manage portal&lt;/description&gt;
-      &lt;value&gt;*:/platform/administrators,*:/organization/management/executive-board&lt;/value&gt;     
-    &lt;/value-param&gt;
+    <value-param>
+      <name>portal.creator.groups</name>
+      <description>groups with membership type have permission to manage portal</description>
+      <value>*:/platform/administrators,*:/organization/management/executive-board</value>     
+    </value-param>
       
-    &lt;value-param&gt;
-      &lt;name&gt;navigation.creator.membership.type&lt;/name&gt;
-      &lt;description&gt;specific membership type have full permission with group navigation&lt;/description&gt;
-      &lt;value&gt;manager&lt;/value&gt;     
-    &lt;/value-param&gt;
-    &lt;value-param&gt;
-      &lt;name&gt;guests.group&lt;/name&gt;
-      &lt;description&gt;guests group&lt;/description&gt;
-      &lt;value&gt;/platform/guests&lt;/value&gt;     
-    &lt;/value-param&gt;     
-    &lt;value-param&gt;
-      &lt;name&gt;access.control.workspace&lt;/name&gt;
-      &lt;description&gt;groups with memberships that have the right to access the User Control Workspace&lt;/description&gt;
-      &lt;value&gt;*:/platform/administrators,*:/organization/management/executive-board&lt;/value&gt;     
-    &lt;/value-param&gt;           
-  &lt;/init-params&gt;   
-&lt;/component&gt;
-</programlisting>
+    <value-param>
+      <name>navigation.creator.membership.type</name>
+      <description>specific membership type have full permission with group navigation</description>
+      <value>manager</value>     
+    </value-param>
+    <value-param>
+      <name>guests.group</name>
+      <description>guests group</description>
+      <value>/platform/guests</value>     
+    </value-param>     
+    <value-param>
+      <name>access.control.workspace</name>
+      <description>groups with memberships that have the right to access the User Control Workspace</description>
+      <value>*:/platform/administrators,*:/organization/management/executive-board</value>     
+    </value-param>           
+  </init-params>   
+</component>]]></programlisting>
 	</section>
 	
 	<section id="sect-Reference_Guide-Portal_Default_Permission_Configuration-Overwrite_Portal_Default_Permissions">
@@ -121,28 +121,27 @@
 			When creating custom portals and portal extensions it is possible to override the default configuration by using <literal>org.exoplatform.portal.config.PortalACLPlugin</literal>, configuring it as an external-plugin of <literal>org.exoplatform.portal.config.UserACL</literal> service:
 		</para>
 		
-<programlisting role="XML">&lt;external-component-plugins&gt;
-    &lt;target-component&gt;org.exoplatform.portal.config.UserACL&lt;/target-component&gt;
-    &lt;component-plugin&gt;
-      &lt;name&gt;addPortalACLPlugin&lt;/name&gt;
-      &lt;set-method&gt;addPortalACLPlugin&lt;/set-method&gt;
-      &lt;type&gt;org.exoplatform.portal.config.PortalACLPlugin&lt;/type&gt;
-      &lt;description&gt;setting some permission for portal&lt;/description&gt;
-      &lt;init-params&gt;     
-        &lt;values-param&gt;
-          &lt;name&gt;access.control.workspace.roles&lt;/name&gt;
-          &lt;value&gt;*:/platform/administrators&lt;/value&gt;
-          &lt;value&gt;*:/organization/management/executive-board&lt;/value&gt;       
-        &lt;/values-param&gt;
-        &lt;values-param&gt;
-          &lt;name&gt;portal.creation.roles&lt;/name&gt;
-          &lt;value&gt;*:/platform/administrators&lt;/value&gt;
-          &lt;value&gt;*:/organization/management/executive-board&lt;/value&gt;      
-        &lt;/values-param&gt;
-      &lt;/init-params&gt;
-    &lt;/component-plugin&gt;
-  &lt;/external-component-plugins&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<external-component-plugins>
+    <target-component>org.exoplatform.portal.config.UserACL</target-component>
+    <component-plugin>
+      <name>addPortalACLPlugin</name>
+      <set-method>addPortalACLPlugin</set-method>
+      <type>org.exoplatform.portal.config.PortalACLPlugin</type>
+      <description>setting some permission for portal</description>
+      <init-params>     
+        <values-param>
+          <name>access.control.workspace.roles</name>
+          <value>*:/platform/administrators</value>
+          <value>*:/organization/management/executive-board</value>       
+        </values-param>
+        <values-param>
+          <name>portal.creation.roles</name>
+          <value>*:/platform/administrators</value>
+          <value>*:/organization/management/executive-board</value>      
+        </values-param>
+      </init-params>
+    </component-plugin>
+  </external-component-plugins>]]></programlisting>
 	</section>
 
 </chapter>

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Internationalization_Configuration">
@@ -42,8 +42,7 @@
 			Inside those file are typical <literal>key=value</literal> Java EE properties. For example; in the <literal>French</literal> file:
 		</para>
 		
-<programlisting>javax.portlet.title=Portlet Navigation
-</programlisting>
+<programlisting language="Java" role="JAVA"><![CDATA[javax.portlet.title=Portlet Navigation]]></programlisting>
 		<para>
 			There are also properties files in the portal itself. They form the <emphasis role="bold">portal resource bundle</emphasis>.
 		</para>
@@ -67,23 +66,23 @@
 	<section id="sect-Reference_Guide-Internationalization_Configuration-Locales_configuration">
 		<title>Locales Configuration</title>
 		<para>
-			Various languages are available in the portal package. The configuration below will define which languages are shown in the "Change Language" section and made available to users.
+			Various languages are available in the portal package. The configuration below will define which languages are shown in the "<emphasis role="bold">Change Language</emphasis>" section and made available to users.
 		</para>
 		<para>
 			The <filename>02portal.war:/WEB-INF/conf/common/common-configuration.xml</filename> file of your installation contains the following section:
 		</para>
 		
-<programlisting role="XML">&lt;component&gt;
-  &lt;key&gt;org.exoplatform.services.resources.LocaleConfigService&lt;/key&gt;
-  &lt;type&gt;org.exoplatform.services.resources.impl.LocaleConfigServiceImpl&lt;/type&gt;
-  &lt;init-params&gt;
-    &lt;value-param&gt;
-      &lt;name&gt;locale.config.file&lt;/name&gt;
-      &lt;value&gt;war:/conf/common/locales-config.xml&lt;/value&gt;
-    &lt;/value-param&gt;
-  &lt;/init-params&gt;
-&lt;/component&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<component>
+  <key>org.exoplatform.services.resources.LocaleConfigService</key>
+  <type>org.exoplatform.services.resources.impl.LocaleConfigServiceImpl</type>
+  <init-params>
+    <value-param>
+      <name>locale.config.file</name>
+      <value>war:/conf/common/locales-config.xml</value>
+    </value-param>
+  </init-params>
+</component>]]></programlisting>
+
 		<para>
 			This configuration points to the locale configuration file.
 		</para>
@@ -99,55 +98,55 @@
 				<area coords="22" id="area-Reference_Guide-i18n.locales.configuration.orientation" />
 			</areaspec>
 			
-<programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;locales-config&gt;
-  &lt;locale-config&gt;
-    &lt;locale&gt;en&lt;/locale&gt;
-    &lt;output-encoding&gt;UTF-8&lt;/output-encoding&gt;
-    &lt;input-encoding&gt;UTF-8&lt;/input-encoding&gt;
-    &lt;description&gt;Default configuration for english locale&lt;/description&gt;
-  &lt;/locale-config&gt;
+<programlisting language="XML" role="XML"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<locales-config>
+  <locale-config>
+    <locale>en</locale>
+    <output-encoding>UTF-8</output-encoding>
+    <input-encoding>UTF-8</input-encoding>
+    <description>Default configuration for english locale</description>
+  </locale-config>
  
-  &lt;locale-config&gt;
-    &lt;locale&gt;fr&lt;/locale&gt;
-    &lt;output-encoding&gt;UTF-8&lt;/output-encoding&gt;
-    &lt;input-encoding&gt;UTF-8&lt;/input-encoding&gt;
-    &lt;description&gt;Default configuration for the french locale&lt;/description&gt;
-  &lt;/locale-config&gt;
+  <locale-config>
+    <locale>fr</locale>
+    <output-encoding>UTF-8</output-encoding>
+    <input-encoding>UTF-8</input-encoding>
+    <description>Default configuration for the french locale</description>
+  </locale-config>
  
-  &lt;locale-config&gt;
-    &lt;locale&gt;ar&lt;/locale&gt;
-    &lt;output-encoding&gt;UTF-8&lt;/output-encoding&gt;
-    &lt;input-encoding&gt;UTF-8&lt;/input-encoding&gt;
-    &lt;description&gt;Default configuration for the arabic locale&lt;/description&gt;
-    &lt;orientation&gt;rt&lt;/orientation&gt;
-  &lt;/locale-config&gt;
-&lt;/locales-config&gt;
-</programlisting>
+  <locale-config>
+    <locale>ar</locale>
+    <output-encoding>UTF-8</output-encoding>
+    <input-encoding>UTF-8</input-encoding>
+    <description>Default configuration for the arabic locale</description>
+    <orientation>rt</orientation>
+  </locale-config>
+</locales-config>]]></programlisting>
+
 			<calloutlist>
 				<callout arearefs="area-Reference_Guide-i18n.locales.configuration.locale">
 					<para>
-						<emphasis>locale</emphasis> The locale has to be defined such as defined here <ulink type="http" url="http://ftp.ics.uci.edu-pub-ietf-http-related-iso639.txt" />. In this example "<emphasis>ar</emphasis>" is Arabic.
+						<emphasis>locale</emphasis>: The locale has to be defined such as defined here <ulink type="http" url="http://ftp.ics.uci.edu-pub-ietf-http-related-iso639.txt" />. In this example "<emphasis>ar</emphasis>" is Arabic.
 					</para>
 				</callout>
 				<callout arearefs="area-Reference_Guide-i18n.locales.configuration.output-encoding">
 					<para>
-						<emphasis>output-encoding</emphasis> deals with character encoding. It is recommended that <emphasis role="bold">UTF-8</emphasis> be used.
+						<emphasis>output-encoding</emphasis>: deals with character encoding. It is recommended that <emphasis role="bold">UTF-8</emphasis> be used.
 					</para>
 				</callout>
 				<callout arearefs="area-Reference_Guide-i18n.locales.configuration.input-encoding">
 					<para>
-						<emphasis>input-encoding</emphasis> In the java implementation, the encoding parameters will be used for the request response stream. The input-encoding parameter will be used for request <literal>setCharacterEncoding(..)</literal>.
+						<emphasis>input-encoding</emphasis>: In the java implementation, the encoding parameters will be used for the request response stream. The input-encoding parameter will be used for request <literal>setCharacterEncoding(..)</literal>.
 					</para>
 				</callout>
 				<callout arearefs="area-Reference_Guide-i18n.locales.configuration.description">
 					<para>
-						<emphasis>description</emphasis> A description of the language
+						<emphasis>description</emphasis>: A description of the language
 					</para>
 				</callout>
 				<callout arearefs="area-Reference_Guide-i18n.locales.configuration.orientation">
 					<para>
-						<emphasis>orientation</emphasis> Although the default orientation of text and images is Left-To-Right, &PRODUCT; supports <emphasis role="bold">Right-To-Left</emphasis> orientation. Modifying text orientation is explained in <xref linkend="chap-Reference_Guide-RTL_Right_To_Left_Framework" />.
+						<emphasis>orientation</emphasis>: Although the default orientation of text and images is Left-To-Right, &PRODUCT; supports <emphasis role="bold">Right-To-Left</emphasis> orientation. Modifying text orientation is explained in <xref linkend="chap-Reference_Guide-RTL_Right_To_Left_Framework" />.
 					</para>
 				</callout>
 			</calloutlist>
@@ -166,49 +165,48 @@
 				<area coords="24" id="area-Reference_Guide-i18n.rb.service.portal_resource_names" />
 			</areaspec>
 			
-<programlisting>&lt;component&gt;
-  &lt;key&gt;org.exoplatform.services.resources.ResourceBundleService&lt;/key&gt;
-  &lt;type&gt;org.exoplatform.services.resources.impl.SimpleResourceBundleService&lt;/type&gt;
-  &lt;init-params&gt;
-    &lt;values-param&gt;
-      &lt;name&gt;classpath.resources&lt;/name&gt;
-      &lt;description&gt;The resources  that start with the following package name should be load from file system&lt;/description&gt;
-      &lt;value&gt;locale.portlet&lt;/value&gt;      
-    &lt;/values-param&gt;      
-    &lt;values-param&gt;
-      &lt;name&gt;init.resources&lt;/name&gt;
-      &lt;description&gt;Initiate the following resources during the first launch&lt;/description&gt;
-      &lt;value&gt;locale.portal.expression&lt;/value&gt;
-      &lt;value&gt;locale.portal.services&lt;/value&gt;
-      &lt;value&gt;locale.portal.webui&lt;/value&gt;
-      &lt;value&gt;locale.portal.custom&lt;/value&gt;
-      &lt;value&gt;locale.navigation.portal.classic&lt;/value&gt;
-      &lt;value&gt;locale.navigation.group.platform.administrators&lt;/value&gt;
-      &lt;value&gt;locale.navigation.group.platform.users&lt;/value&gt;
-      &lt;value&gt;locale.navigation.group.platform.guests&lt;/value&gt;
-      &lt;value&gt;locale.navigation.group.organization.management.executive-board&lt;/value&gt;               
-    &lt;/values-param&gt;      
-    &lt;values-param&gt;
-      &lt;name&gt;portal.resource.names&lt;/name&gt;
-      &lt;description&gt;The properties files of  the portal ,  those file will be merged 
-        into one ResoruceBundle properties &lt;/description&gt;
-      &lt;value&gt;locale.portal.expression&lt;/value&gt;
-      &lt;value&gt;locale.portal.services&lt;/value&gt;
-      &lt;value&gt;locale.portal.webui&lt;/value&gt;
-      &lt;value&gt;locale.portal.custom&lt;/value&gt;        
-    &lt;/values-param&gt;      
-  &lt;/init-params&gt;
-&lt;/component&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<component>
+  <key>org.exoplatform.services.resources.ResourceBundleService</key>
+  <type>org.exoplatform.services.resources.impl.SimpleResourceBundleService</type>
+  <init-params>
+    <values-param>
+      <name>classpath.resources</name>
+      <description>The resources  that start with the following package name should be load from file system</description>
+      <value>locale.portlet</value>      
+    </values-param>      
+    <values-param>
+      <name>init.resources</name>
+      <description>Initiate the following resources during the first launch</description>
+      <value>locale.portal.expression</value>
+      <value>locale.portal.services</value>
+      <value>locale.portal.webui</value>
+      <value>locale.portal.custom</value>
+      <value>locale.navigation.portal.classic</value>
+      <value>locale.navigation.group.platform.administrators</value>
+      <value>locale.navigation.group.platform.users</value>
+      <value>locale.navigation.group.platform.guests</value>
+      <value>locale.navigation.group.organization.management.executive-board</value>               
+    </values-param>      
+    <values-param>
+      <name>portal.resource.names</name>
+      <description>The properties files of  the portal ,  those file will be merged 
+        into one ResoruceBundle properties </description>
+      <value>locale.portal.expression</value>
+      <value>locale.portal.services</value>
+      <value>locale.portal.webui</value>
+      <value>locale.portal.custom</value>        
+    </values-param>      
+  </init-params>
+</component>]]></programlisting>
 			<calloutlist>
 				<callout arearefs="area-Reference_Guide-i18n.rb.service.classpath_resources">
 					<para>
-						<emphasis>classpath.resources</emphasis> are discussed in a later section.
+						<emphasis>classpath.resources</emphasis>: These are discussed in a later section.
 					</para>
 				</callout>
 				<callout arearefs="area-Reference_Guide-i18n.rb.service.portal_resource_names">
 					<para>
-						<emphasis>portal.resource.names</emphasis> Defines all resources that belong to the <emphasis>Portal Resource Bundle</emphasis>.
+						<emphasis>portal.resource.names</emphasis>: Defines all resources that belong to the <emphasis>Portal Resource Bundle</emphasis>.
 					</para>
 					<para>
 						These resources are merged to a single resource bundle which is accessible from anywhere in &PRODUCT;. All these keys are located in the same bundle, which is separated from the navigation resource bundles.
@@ -257,14 +255,9 @@
 			All shipped portlet resources are located in the <emphasis role="bold">locale/portlet</emphasis> subfolder. The ResourceBundleService parameter <emphasis role="bold">classpath.resources</emphasis> defines this subfolder. <!--    Doing so the resource file that are in ~~locale/portlet~~ will never be stored in the JCR and reloaded at each start of the application server.    -->
 		</para>
 		<procedure id="proc-Reference_Guide-_Portlets_-Example">
-			<title>Example</title>
+			<title>To add a Spanish translation to the <parameter>GadgetPortlet</parameter></title>
 			<step>
 				<para>
-					To add a Spanish translation to the <parameter>GadgetPortlet</parameter>.
-				</para>
-			</step>
-			<step>
-				<para>
 					Create the file <literal>GadgetPortlet_es.properties</literal> in: <filename>WEB-INF/classes/locale/portlet/gadget/GadgetPortlet</filename>.
 				</para>
 			</step>
@@ -273,10 +266,10 @@
 					In <filename>portlet.xml</filename>, add <parameter>Spanish</parameter> as a <emphasis role="bold">supported-locale</emphasis> ('<emphasis role="bold">es</emphasis>' is the two letter code for Spanish). The <emphasis role="bold">resource-bundle</emphasis> is already declared and is the same for all languages :
 				</para>
 				
-<programlisting role="XML">&lt;supported-locale&gt;en&lt;/supported-locale&gt;
-&lt;supported-locale&gt;es&lt;/supported-locale&gt;
-&lt;resource-bundle&gt;locale.portlet.gadget.GadgetPortlet&lt;/resource-bundle&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<supported-locale>en</supported-locale>
+<supported-locale>es</supported-locale>
+<resource-bundle>locale.portlet.gadget.GadgetPortlet</resource-bundle>]]></programlisting>
+
 			</step>
 		</procedure>
 		
@@ -289,10 +282,9 @@
 				The portlet specifications defines three standard keys: <emphasis>Title</emphasis>, <emphasis>Short Title</emphasis> and <emphasis>Keywords</emphasis>. Keywords is formatted as a comma-separated list of tags.
 			</para>
 			
-<programlisting> javax.portlet.title=Breadcrumbs Portlet
+<programlisting language="Java" role="JAVA"><![CDATA[javax.portlet.title=Breadcrumbs Portlet
  javax.portlet.short-title=Breadcrumbs
- javax.portlet.keywords=Breadcrumbs, Breadcrumb
-</programlisting>
+ javax.portlet.keywords=Breadcrumbs, Breadcrumb]]></programlisting>
 		</section>
 		
 		<section id="sect-Reference_Guide-_Portlets_-Debugging_Resource_Bundle_Usage">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Javascript_Configuration">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/JavascriptInterApplicationCommunication.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/JavascriptInterApplicationCommunication.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/JavascriptInterApplicationCommunication.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-JavaScript_Inter_Application_Communication">
@@ -11,7 +11,7 @@
 			JavaScript Inter Application Communication is designed to allow applications within a page to exchange data. This library is made for broadcasting messages on topic.
 		</para>
 		<para>
-			It is based on 3 functions:
+			It is based on three functions:
 		</para>
 		<itemizedlist>
 			<listitem>
@@ -47,7 +47,7 @@
 				<term>/eXo/portal/notification</term>
 				<listitem>
 					<para>
-						A message is sent on this topic will prompt a popup notification in the top right of the screen.
+						A message is sent on this topic will prompt a pop-up notification in the top right of the screen.
 					</para>
 				</listitem>
 			</varlistentry>
@@ -248,23 +248,23 @@
 	<section id="sect-Reference_Guide-JavaScript_Inter_Application_Communication-Example_of_Javascript_events_usage">
 		<title>Example of Javascript events usage</title>
 		
-<programlisting role="HTML">&lt;%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %&gt;
-&lt;portlet:defineObjects/&gt;
-&lt;div&gt;
-  &lt;p&gt;
+<programlisting language="HTML" role="HTML"><![CDATA[<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<portlet:defineObjects/>
+<div>
+  <p>
     Received messages:
-    &lt;div id="received_&lt;portlet:namespace/&gt;"&gt;
+    <div id="received_<portlet:namespace/>">
          
-    &lt;/div&gt;
-  &lt;/p&gt;
+    </div>
+  </p>
    
-  &lt;p&gt;
+  <p>
     Send message:
-    &lt;input type="text" id="msg_&lt;portlet:namespace/&gt;"/&gt; &lt;a href="#" onclick="send_&lt;portlet:namespace/&gt;();"&gt;send&lt;/a&gt;
-  &lt;/p&gt;
-&lt;/div&gt;
+    <input type="text" id="msg_<portlet:namespace/>"/> <a href="#" onclick="send_<portlet:namespace/>();">send</a>
+  </p>
+</div>
 
-&lt;script type="text/javascript"&gt;
+<script type="text/javascript">
    
   Function.prototype.bind = function(object) {
     var method = this;
@@ -273,29 +273,28 @@
     }
   }
    
-  function send_&lt;portlet:namespace/&gt;() {
-    var msg = document.getElementById("msg_&lt;portlet:namespace/&gt;").value;
-    eXo.core.Topic.publish("&lt;portlet:namespace/&gt;", "/demo", msg);
+  function send_<portlet:namespace/>() {
+    var msg = document.getElementById("msg_<portlet:namespace/>").value;
+    eXo.core.Topic.publish("<portlet:namespace/>", "/demo", msg);
   }
    
-  function Listener_&lt;portlet:namespace/&gt;(){
+  function Listener_<portlet:namespace/>(){
       
   }
    
-  Listener_&lt;portlet:namespace/&gt;.prototype.receiveMsg = function(event) {
-    document.getElementById("received_&lt;portlet:namespace/&gt;").innerHTML = 
-      document.getElementById("received_&lt;portlet:namespace/&gt;").innerHTML + "&lt;br /&gt;* " + 
+  Listener_<portlet:namespace/>.prototype.receiveMsg = function(event) {
+    document.getElementById("received_<portlet:namespace/>").innerHTML = 
+      document.getElementById("received_<portlet:namespace/>").innerHTML + "<br />* " + 
       event.senderId + ": " + event.message;
   }
    
-  function init_&lt;portlet:namespace/&gt;() {
-    var listener_&lt;portlet:namespace/&gt; = new Listener_&lt;portlet:namespace/&gt;();
-    eXo.core.Topic.subscribe("/demo", listener_&lt;portlet:namespace/&gt;.receiveMsg.bind(listener_&lt;portlet:namespace/&gt;));
+  function init_<portlet:namespace/>() {
+    var listener_<portlet:namespace/> = new Listener_<portlet:namespace/>();
+    eXo.core.Topic.subscribe("/demo", listener_<portlet:namespace/>.receiveMsg.bind(listener_<portlet:namespace/>));
   }
    
-  init_&lt;portlet:namespace/&gt;();
-&lt;/script&gt;
-</programlisting>
+  init_<portlet:namespace/>();
+</script>]]></programlisting>
 	</section>
 
 </chapter>

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/PortalLifecycle.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Portal_Lifecycle">
@@ -8,7 +8,7 @@
 	<section id="sect-Reference_Guide-Portal_Lifecycle-Overview">
 		<title>Overview</title>
 		<para>
-			This chapter describes the portal life-cycle from the application server start to its stop as well as how requests are handled.
+			This chapter describes the portal life-cycle from the application server start to its stop including how requests are handled.
 		</para>
 	</section>
 	
@@ -99,22 +99,21 @@
 		<note>
 			<title>Servlet Configuration</title>
 			<para>
-				As the servlet is already configured this example is for information only.
+				<emphasis role="bold">As the servlet is already configured this example is for information only.</emphasis>
 			</para>
 		</note>
 		
-<programlisting role="XML">
-&lt;servlet&gt;
-  &lt;servlet-name&gt;TomcatGateInServlet&lt;/servlet-name&gt;
-  &lt;servlet-class&gt;org.gatein.wci.command.CommandServlet&lt;/servlet-class&gt;
-  &lt;load-on-startup&gt;0&lt;/load-on-startup&gt;
-&lt;/servlet&gt;
+<programlisting language="XML" role="XML"><![CDATA[<servlet>
+  <servlet-name>TomcatGateInServlet</servlet-name>
+  <servlet-class>org.gatein.wci.command.CommandServlet</servlet-class>
+  <load-on-startup>0</load-on-startup>
+</servlet>
   
-&lt;servlet-mapping&gt;
-  &lt;servlet-name&gt;TomcatGateInServlet&lt;/servlet-name&gt;
-  &lt;url-pattern&gt;/tomcatgateinservlet&lt;/url-pattern&gt;
-&lt;/servlet-mapping&gt;
-</programlisting>
+<servlet-mapping>
+  <servlet-name>TomcatGateInServlet</servlet-name>
+  <url-pattern>/tomcatgateinservlet</url-pattern>
+</servlet-mapping>]]></programlisting>
+
 		<para>
 			It is possible to filter on the <literal>CommandServlet</literal> by filtering the URL pattern used by the servlet mapping.
 		</para>
@@ -124,9 +123,7 @@
 		<para>
 			The filter class:
 		</para>
-		
-<programlisting role="JAVA">
-package org.example;
+<programlisting language="Java" role="JAVA"><![CDATA[package org.example;
 
 import java.io.IOException;
 
@@ -156,7 +153,8 @@
   }
 
 }
-</programlisting>
+]]></programlisting>
+
 		<para>
 			The Java EE web application configuration file (<filename>web.xml</filename>) of the portlet is the file on which we want to know the time to serve a portlet request.
 		</para>
@@ -164,30 +162,29 @@
 			As mentioned above nothing specific to &PRODUCT; needs to be included, only the URL pattern to set has to be known.
 		</para>
 		
-<programlisting role="XML">
-&lt;?xml version="1.0"?&gt;
-&lt;web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<programlisting language="XML" role="XML"><![CDATA[<?xml version="1.0"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-    version="2.5"&gt;
+    version="2.5">
         
-  &lt;filter&gt;
-    &lt;filter-name&gt;MyFilter&lt;/filter-name&gt;
-    &lt;filter-class&gt;org.example.MyFilter&lt;/filter-class&gt;        
-  &lt;/filter&gt;
+  <filter>
+    <filter-name>MyFilter</filter-name>
+    <filter-class>org.example.MyFilter</filter-class>        
+  </filter>
 
-  &lt;filter-mapping&gt;
-    &lt;filter-name&gt;MyFilter&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/tomcatgateinservlet&lt;/url-pattern&gt;
-    &lt;dispatcher&gt;INCLUDE&lt;/dispatcher&gt;  
-  &lt;/filter-mapping&gt;    
+  <filter-mapping>
+    <filter-name>MyFilter</filter-name>
+    <url-pattern>/tomcatgateinservlet</url-pattern>
+    <dispatcher>INCLUDE</dispatcher>  
+  </filter-mapping>    
     
-&lt;/web-app&gt;
-</programlisting>
+</web-app>]]></programlisting>
+
 		<para>
 			<note>
 				<title>INCLUDE dispatcher</title>
 				<para>
-					It is important to set <literal>INCLUDE</literal> as dispatcher as the portal will always hit the <literal>CommandServlet</literal> through a request dispatcher. Without this, the filter will not be triggered, unless direct access to a resource (such as an image).
+					It is important to set <literal>INCLUDE</literal> as dispatcher as the portal will always hit the <literal>CommandServlet</literal> through a request dispatcher. Without this, the filter will not be triggered, unless direct access to a resource (such as an image) is set.
 				</para>
 			</note>
 		</para>

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-RTL_Right_To_Left_Framework">
@@ -9,18 +9,17 @@
 		The text orientation depends on the current locale setting. The orientation is a Java 5 enum that provides a set of functionalities:
 	</para>
 	
-<programlisting>
-   LT, // Western Europe
+<programlisting language="Java" role="JAVA"><![CDATA[   LT, // Western Europe
    RT, // Middle East (Arabic, Hebrew)
    TL, // Japanese, Chinese, Korean
    TR; // Mongolian
    public boolean isLT() { ... }
    public boolean isRT() { ... }
    public boolean isTL() { ... }
-   public boolean isTR() { ... }
-</programlisting>
+   public boolean isTR() { ... }]]></programlisting>
+
 	<para>
-		The object defining the Orientation for the current request is the <literal>UIPortalApplication</literal>. However it should be accessed at runtime using the <literal>RequestContext</literal> that delegates to the <literal>UIPortalApplication</literal>.
+		The object defining the orientation for the current request is the <literal>UIPortalApplication</literal>. However it should be accessed at runtime using the <literal>RequestContext</literal> that delegates to the <literal>UIPortalApplication</literal>.
 	</para>
 	<para>
 		In the case of a <literal>PortalRequestContext</literal> it is a direct delegate as the <literal>PortalRequestContext</literal> has a reference to the current <literal>UIPortalApplication</literal>.
@@ -83,7 +82,9 @@
 		<formalpara id="form-Reference_Guide-Stylesheet-Example_1">
 			<title>Example 1</title>
 			<para>
-				In the example we need to use the orientation to modify the float attribute that will make the horizontal tabs either float on left or on right: 
+				In the example we need to use the orientation to modify the float attribute that will make the horizontal tabs either float on left or on right:
+			</para>
+		</formalpara>
 <programlisting>
 float: left; /* orientation=lt */
 float: right; /* orientation=rt */
@@ -91,52 +92,60 @@
 text-align: center;
 white-space: nowrap;
 </programlisting>
-				 The LT produced output will be: 
+				 <para>
+				 	The LT produced output will be: 
+				 </para>
 <programlisting>
 float: left; /* orientation=lt */
 font-weight: bold;
 text-align: center;
 white-space: nowrap;
 </programlisting>
-				 The RT produced output will be: 
+				 <para>
+				 	The RT produced output will be: 
+				 </para>
 <programlisting> 
 float: right; /* orientation=rt */
 font-weight: bold;
 text-align: center;
 white-space: nowrap;
 </programlisting>
-			</para>
-		</formalpara>
+
 		<formalpara id="form-Reference_Guide-Stylesheet-Example_2">
 			<title>Example 2</title>
 			<para>
-				In this example we need to modify the padding according to the orientation: 
+				In this example we need to modify the padding according to the orientation:
+			</para>
+		</formalpara>
 <programlisting>
 color: white;
 line-height: 24px;
 padding: 0px 5px 0px 0px; /* orientation=lt */
 padding: 0px 0px 0px 5px; /* &gt;orientation=rt */
 </programlisting>
-				 The LT produced output will be: 
+				 <para>
+				 	The LT produced output will be: 
+				 </para>
 <programlisting> 
 color: white;
 line-height: 24px;
 padding: 0px 5px 0px 0px; /* orientation=lt */
 </programlisting>
-				 The RT produced output will be: 
+				 <para>
+				 	The RT produced output will be: 
+				 </para>
 <programlisting> 
 color: white;
 line-height: 24px;
 padding: 0px 0px 0px 5px; /* orientation=rt */
 </programlisting>
-			</para>
-		</formalpara>
+
 	</section>
 	
 	<section id="sect-Reference_Guide-RTL_Right_To_Left_Framework-Images">
 		<title>Images</title>
 		<para>
-			Sometimes it is necessary to create an RT version of an image that will be used from a template or from a stylesheet. However symmetric images can be automatically generated avoiding the necessity to create a mirrored version of an image and furthermore avoiding maintenance cost.
+			Sometimes it is necessary to create an RT version of an image that will be used from a template or from a stylesheet. However symmetric images can be automatically generated, avoiding the necessity to create a mirrored version of an image and further maintenance costs.
 		</para>
 		<para>
 			The web resource filter uses the same naming pattern as the skin service. When an image ends with the -rt suffix the portal will attempt to locate the original image and create a mirror of it.

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Skinning_the_portal">
@@ -8,14 +8,14 @@
 	<section id="sect-Reference_Guide-Skinning_the_portal-Overview">
 		<title>Overview</title>
 		<para>
-			&PRODUCT; provides robust skinning support for the entire portal User Interface (UI). This includes support for skinning all of the common portal elements as well as being able to provide custom skins and window decoration for individual portlets. All of this designed with common graphic resource reuse and ease of development in mind.
+			&PRODUCT; provides robust skinning support for the entire portal User Interface (UI). This includes support for skinning all of the common portal elements as well as being able to provide custom skins and window decoration for individual portlets. This has been designed with common graphic resource reuse and ease of development in mind.
 		</para>
 	</section>
 	
 	<section id="sect-Reference_Guide-Skinning_the_portal-Skin_Components">
 		<title>Skin Components</title>
 		<para>
-			The complete skinning of a page is composed of three main parts:
+			The skinning of a page is composed of three separate parts:
 		</para>
 		<variablelist>
 			<varlistentry>
@@ -30,7 +30,7 @@
 				<term>Window Styles</term>
 				<listitem>
 					<para>
-						The CSS styles associated with the porlet window decorators. The window decorators contain the control buttons and borders surrounding each portlet. Individual portlets can have their own window decorator selected, or be rendered without one.
+						The CSS styles associated with the porlet window decorators. The window decorators contain the control buttons and borders surrounding each portlet. Individual portlets can have their own window decorator selected or be rendered without one.
 					</para>
 				</listitem>
 			</varlistentry>
@@ -38,7 +38,7 @@
 				<term>Portlet Skins</term>
 				<listitem>
 					<para>
-						The portlet skins effect how portlets are rendered on the page. There are two main ways this can be affected:
+						The portlet skins dictate how portlets are rendered on the page. There are two main ways they can be effected:
 					</para>
 					<variablelist>
 						<varlistentry>
@@ -77,10 +77,10 @@
 		<section id="sect-Reference_Guide-Skin_Selection-Skin_Selection_Through_the_User_Interface">
 			<title>Skin Selection Through the User Interface</title>
 			<para>
-				There are a few means in which a skin can be selected to be displayed to the user. The easiest way to change the skin is select it through the user interface. An administrator can change the default skin for the portal, or a logged in user can select which skin they would prefer to be displayed.
+				A skin can be selected to be displayed to the user by multiple means. The easiest way to change the skin is to select it through the user interface. An administrator can change the default skin for the portal, or a logged in user can select which skin they would prefer to be displayed.
 			</para>
 			<para>
-				Please see the <ulink type="http" url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/5.0/html/Enterprise_Portal_Platform_User_Guide/index.html">User Guide</ulink> for information on how to change the skin using the user interface.
+				Please see the <ulink type="http" url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/">User Guide</ulink> for information on how to change the skin using the user interface.
 			</para>
 		</section>
 		
@@ -96,14 +96,13 @@
 				To change the skin to <literal>MySkin</literal> you would make the following changes:
 			</para>
 			
-<programlisting role="XML">&lt;portal-config&gt;
-                &lt;portal-name&gt;classic&lt;/portal-name&gt;
-                &lt;locale&gt;en&lt;/locale&gt;
-                &lt;access-permissions&gt;Everyone&lt;/access-permissions&gt;
-                &lt;edit-permission&gt;*:/platform/administrators&lt;/edit-permission&gt;
-                &lt;skin&gt;MySkin&lt;/skin&gt;
-                ...
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<portal-config>
+                <portal-name>classic</portal-name>
+                <locale>en</locale>
+                <access-permissions>Everyone</access-permissions>
+                <edit-permission>*:/platform/administrators</edit-permission>
+                <skin>MySkin</skin>
+		...]]></programlisting>
 		</section>
 
 	</section>
@@ -121,7 +120,7 @@
 				<term>Portal Skin</term>
 				<listitem>
 					<para>
-						The portal skin will appear as a single link to a CSS file. This link will contain contents from all the portal skin classes merged into one file. This allows the portal skin to be transfered as a single file instead of multiple smaller files. Included with every page render <emphasis>&gt;-- Unsure what this is referring to.</emphasis>
+						The portal skin will appear as a single link to a CSS file. This link will contain contents from all the portal skin classes merged into one file. This allows the portal skin to be transferred as a single file instead of multiple smaller files.
 					</para>
 				</listitem>
 			</varlistentry>
@@ -137,20 +136,20 @@
 		<para>
 			In the code fragment below you can see the two types of links:
 		</para>
-		
-<programlisting role="XML">&lt;head&gt;
+<programlisting language="XML" role="XML"><![CDATA[<head>
 ...
-&lt;!-- The portal skin --&gt;
-&lt;link id="CoreSkin" rel="stylesheet" type="text/CSS" href="/eXoResources/skin/Stylesheet.CSS" /&gt;
+<!-- The portal skin -->
+<link id="CoreSkin" rel="stylesheet" type="text/CSS" href="/eXoResources/skin/Stylesheet.CSS" />
 
-&lt;!-- The portlet skins --&gt;
-&lt;link id="web_FooterPortlet" rel="stylesheet" type="text/CSS" href= "/web/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.CSS" /&gt;
-&lt;link id="web_NavigationPortlet" rel="stylesheet" type="text/CSS" href= "/web/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.CSS" /&gt;
-&lt;link id="web_HomePagePortlet" rel="stylesheet" type="text/CSS" href= "/portal/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet.CSS" /&gt;
-&lt;link id="web_BannerPortlet" rel="stylesheet" type="text/CSS" href= "/web/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.CSS" /&gt;
+<!-- The portlet skins -->
+<link id="web_FooterPortlet" rel="stylesheet" type="text/CSS" href= "/web/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.CSS" />
+<link id="web_NavigationPortlet" rel="stylesheet" type="text/CSS" href= "/web/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.CSS" />
+<link id="web_HomePagePortlet" rel="stylesheet" type="text/CSS" href= "/portal/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet.CSS" />
+<link id="web_BannerPortlet" rel="stylesheet" type="text/CSS" href= "/web/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.CSS" />
 ...
-&lt;/head&gt;
-</programlisting>
+</head>
+]]></programlisting>
+
 		<note>
 		<title>CSS Classes</title>
 			<para>
@@ -162,40 +161,39 @@
 	<section id="sect-Reference_Guide-Skinning_the_portal-The_Skin_Service">
 		<title>The Skin Service</title>
 		<para>
-			The skin service is a service which manages the various types of skins. It is reponsible for discovering and deploying the skins into the portal.
+			The skin service manages the various types of skins. It is responsible for discovering and deploying skins into the portal.
 		</para>
 		<section id="sect-Reference_Guide-The_Skin_Service-Skin_configuration">
 			<title>Skin configuration</title>
 			<para>
-				&PRODUCT; automatically discovers web archives that contain a file descriptor for skins (<filename>WEB-INF/gatein-resources.xml</filename>). This file is reponsible for specifying the portal, portlet and window decorators to be deployed into the skin service.
+				&PRODUCT; automatically discovers web archives that contain a file descriptor for skins (<filename>WEB-INF/gatein-resources.xml</filename>). This file is responsible for specifying the portal, portlet and window decorators to be deployed into the skin service.
 			</para>
 			<para>
 				The full schema can be found at: <ulink type="http" url="http://www.gatein.org/xml/ns/gatein_resources_1_0"/>.
 			</para>
 
 			<para>
-				Here is an example where we define a skin (<literal>MySkin</literal>) with its CSS location, and specify a few window decorator skins:
+				Below is an example of where to define a skin (<literal>MySkin</literal>) with its CSS location, and specify some window decorator skins:
 			</para>
 			
-<programlisting role="XML">&lt;gatein-resources&gt;
-  &lt;portal-skin&gt;
-    &lt;skin-name&gt;MySkin&lt;/skin-name&gt;
-    &lt;CSS-path&gt;/skin/myskin.CSS&lt;/CSS-path&gt;
-    &lt;overwrite&gt;false&lt;/overwrite&gt;
-  &lt;/portal-skin&gt;
-&lt;/gatein-resources&gt;
+<programlisting language="XML" role="XML"><![CDATA[<gatein-resources>
+  <portal-skin>
+    <skin-name>MySkin</skin-name>
+    <CSS-path>/skin/myskin.CSS</CSS-path>
+    <overwrite>false</overwrite>
+  </portal-skin>
+</gatein-resources>
 
-  &lt;!-- window style --&gt;
-  &lt;window-style&gt;
-    &lt;style-name&gt;MyThemeCategory&lt;/style-name&gt;
-    &lt;style-theme&gt;
-      &lt;theme-name&gt;MyThemeBlue&lt;/theme-name&gt;
-    &lt;/style-theme&gt;
-    &lt;style-theme&gt;
-      &lt;theme-name&gt;MyThemeRed&lt;/theme-name&gt;
-    &lt;/style-theme&gt;
-    ...
-</programlisting>
+  <!-- window style -->
+  <window-style>
+    <style-name>MyThemeCategory</style-name>
+    <style-theme>
+      <theme-name>MyThemeBlue</theme-name>
+    </style-theme>
+    <style-theme>
+      <theme-name>MyThemeRed</theme-name>
+    </style-theme>
+    ...]]></programlisting>
 		</section>
 		
 		<section id="sect-Reference_Guide-The_Skin_Service-Resource_Request_Filter">
@@ -207,16 +205,16 @@
 				Any new web applications containing skinning CSS files will need to have the following added to their <filename>web.xml</filename> :
 			</para>
 			
-<programlisting role="XML">&lt;filter&gt;
-      &lt;filter-name&gt;ResourceRequestFilter&lt;/filter-name&gt;
-      &lt;filter-class&gt;org.exoplatform.portal.application.ResourceRequestFilter&lt;/filter-class&gt;
-      &lt;/filter&gt;
+<programlisting language="XML" role="XML"><![CDATA[<filter>
+      <filter-name>ResourceRequestFilter</filter-name>
+      <filter-class>org.exoplatform.portal.application.ResourceRequestFilter</filter-class>
+      </filter>
 
-      &lt;filter-mapping&gt;
-      &lt;filter-name&gt;ResourceRequestFilter&lt;/filter-name&gt;
-      &lt;url-pattern&gt;*.CSS&lt;/url-pattern&gt;
-      &lt;/filter-mapping&gt;
-</programlisting>
+      <filter-mapping>
+      <filter-name>ResourceRequestFilter</filter-name>
+      <url-pattern>*.CSS</url-pattern>
+      </filter-mapping>
+]]></programlisting>
 		
 		<note>
 		<title>The <literal>display-name</literal> Element</title>
@@ -232,52 +230,6 @@
 		<para>
 			The default skin for &PRODUCT; is located as part of the <literal>01eXoResource.war</literal>. The main files associated with the skin are:
 		</para>
-<!--		<programlistingco>
-			<areaspec>
-				<area coords="1" id="area-Reference_Guide-Skin_Configuration-Default_Skin-gatein-resources" />
-				<area coords="2" id="area-Reference_Guide-Skin_Configuration-Default_Skin-web" />
-				<area coords="3" id="area-Reference_Guide-Skin_Configuration-Default_Skin-skin-Stylesheet" />
-			</areaspec>
-			
-<programlisting>WEB-INF/gatein-resources.xml
-WEB-INF/web.xml
-skin/Stylesheet.CSS
-</programlisting>
-			<calloutlist>
-				<callout arearefs="area-Reference_Guide-Skin_Configuration-Default_Skin-gatein-resources">
-					<para>
-						gatein-resources.xml: defines the skin setup to use
-					</para>
-				</callout>
-				<callout arearefs="area-Reference_Guide-Skin_Configuration-Default_Skin-web">
-					<para>
-						web.xml: contains the resource filer and has the display-name set
-					</para>
-				</callout>
-				<callout arearefs="area-Reference_Guide-Skin_Configuration-Default_Skin-skin-Stylesheet">
-					<para>
-						Stylesheet.CSS: contains the CSS class definitions for this skin.
-					</para>
-				</callout>
-			</calloutlist>
-		</programlistingco> -->
-		<itemizedlist>
-			<listitem>
-				<para>
-					<filename>WEB-INF/gatein-resources.xml</filename>
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<filename>WEB-INF/web.xml</filename>
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<filename>skin/Stylesheet.CSS</filename>
-				</para>
-			</listitem>
-		</itemizedlist>
 		<variablelist>
 			<varlistentry>
 				<term>gatein-resources.xml</term>
@@ -339,7 +291,7 @@
 					</programlistingco>
 					
 					<para>
-						Instead of defining all the CSS classes in this one file, we are instead importing other CSS stylesheet files, some of which may also import other CSS stylesheets. Splitting the CSS classes between multiple files allows new skins to reuse parts of the default skin.
+						This method imports other CSS stylesheet files (some of which may also import further CSS stylesheets) instead of defining all the CSS classes in this one file. Splitting the CSS classes between multiple files allows new skins to reuse parts of the default skin.
 					</para>
 					<para>
 						To reuse a CSS stylesheet from the default portal skin you would need to reference the default skin from <literal>eXoResources</literal>. For example; to include the window decorators from the default skin within a new portal skin you would need to use this import:
@@ -350,7 +302,7 @@
 					<note>
 						<title>Stylesheet Merging</title>
 						<para>
-							When the portal skin is added to the page, it merge all the CSS stylesheets into a single file.
+							When the portal skin is added to the page, it merges all the CSS stylesheets into a single file.
 						</para>
 					</note>
 				</listitem>
@@ -371,14 +323,14 @@
 					The <filename>gatein-resources.xml</filename> will need to specify the new portal skin. This will include the name of the new skin, where to locate its CSS stylesheet file and whether to overwrite an existing portal theme with the same name.
 				</para>
 				
-<programlisting role="XML">&lt;gatein-resources&gt;
-  &lt;portal-skin&gt;
-    &lt;skin-name&gt;MySkin&lt;/skin-name&gt;
-    &lt;CSS-path&gt;/skin/myskin.CSS&lt;/CSS-path&gt;
-    &lt;overwrite&gt;false&lt;/overwrite&gt;
-  &lt;/portal-skin&gt;
-&lt;/gatein-resources&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<gatein-resources>
+  <portal-skin>
+    <skin-name>MySkin</skin-name>
+    <CSS-path>/skin/myskin.CSS</CSS-path>
+    <overwrite>false</overwrite>
+  </portal-skin>
+</gatein-resources>]]></programlisting>
+
 				<para>
 					The default portal skin and window styles are defined in <filename>01eXoResources.war/WEB-INF/gatein-resources.xml</filename>.
 				</para>
@@ -393,7 +345,7 @@
 			<section id="sect-Reference_Guide-Creating_a_New_Portal_Skin-Portal_Skin_Preview_Icon">
 				<title>Portal Skin Preview Icon</title>
 				<para>
-					When selecting a skin it is possible to see a preview of what the skin will look like. The current skin needs to know about the skin icons for all the available skins, otherwise it will not be able to show the previews.
+					It is possible to see a preview of what the portal will look like when selecting a new skin. This functionality relies on the current skin being updated with skin icons for all other available skins. Otherwise it will not be able to show the previews.
 				</para>
 				<para>
 					It is recommended that preview icons of any other skins are included when creating a new portal skin and that the other skins are updated with your new portal skin preview.
@@ -415,12 +367,14 @@
 				
 <programlisting>.UIChangeSkinForm .UIItemSelector .TemplateContainer .<emphasis role="bold">MySkinImage</emphasis>
 </programlisting>
+
 				<para>
-					In order for the default skin to know about the skin icon for a new portal skin, the preview screenshot needs to be place in: <filename>01eXoResources.war:/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/background</filename>.
+					In order for the default skin to display the skin icon for a new portal skin, the preview screenshot needs to be placed in: <filename>01eXoResources.war:/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/background</filename>.
 				</para>
 				<para>
 					The CSS stylesheet for the default portal needs to have the following updated with the preview icon CSS class. For a skin named <emphasis role="bold">MySkin</emphasis> then the following needs to be updated: <filename>01eXoResources.war:/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/Stylesheet.CSS</filename>.
 				</para>
+
 <programlisting>.UIChangeSkinForm .UIItemSelector .TemplateContainer .<emphasis role="bold">MySkinImage</emphasis> {
   margin: auto;
   width: 329px; height:204px;
@@ -435,7 +389,7 @@
 		<section id="sect-Reference_Guide-Creating_New_Skins-Creating_a_New_Window_Style">
 			<title>Creating a New Window Style</title>
 			<para>
-				Window styles are the CSS applied to window decorations. An administrator can decide which style of decoration should go around the window when he adds a new application or gadget to a page.
+				Window styles are the CSS applied to window decorations. An administrator can decide which style of decoration should go around the window when they add a new application or gadget to a page.
 			</para>
 			<mediaobject>
 				<imageobject role="html">
@@ -455,24 +409,27 @@
 					The following <filename>gatein-resource.xml</filename> fragment will add <literal>MyThemeBlue</literal> and <literal>MyThemeRed</literal> to the <literal>MyTheme</literal> category.
 				</para>
 				
-<programlisting role="XML">&lt;window-style&gt;
-  &lt;style-name&gt;MyTheme&lt;/style-name&gt;
-  &lt;style-theme&gt;
-    &lt;theme-name&gt;MyThemeBlue&lt;/theme-name&gt;
-  &lt;/style-theme&gt;
-  &lt;style-theme&gt;
-    &lt;theme-name&gt;MyThemeRed&lt;/theme-name&gt;
-  &lt;/style-theme&gt;
-&lt;/window-style&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<window-style>
+  <style-name>MyTheme</style-name>
+  <style-theme>
+    <theme-name>MyThemeBlue</theme-name>
+  </style-theme>
+  <style-theme>
+    <theme-name>MyThemeRed</theme-name>
+  </style-theme>
+</window-style>]]></programlisting>
+
 				<para>
 					The windows style configuration for the default skin is configured in: 				<filename>01eXoResources.war/WEB-INF/gatein-resources.xml</filename>.
 				</para>
 				<note>
 					<title>Window Styles and Portal Skins</title>
 					<para>
-						When a window style is defined in <filename>gatein-resources.xml</filename> file, it will be available to all portlets regardless of whether the current portal skin supports the window decorator or not. It is recommended that when a new window decorator is added that it be added to all portal skins or that all portal skins share a common stylesheet for window decorators.
+						When a window style is defined in <filename>gatein-resources.xml</filename> file, it will be available to all portlets regardless of whether the current portal skin supports the window decorator or not. 
 					</para>
+					<para>
+						It is recommended that when a new window decorator is added that it be added to all portal skins or that all portal skins share a common stylesheet for window decorators.
+					</para>
 				</note>
 			</section>
 			
@@ -641,32 +598,37 @@
 				Portlets often require additional styles that may not be defined by the portal skin. &PRODUCT; allows portlets to define additional stylesheets for each portlet and will append the corresponding <literal>link</literal> tags to the <literal>head</literal>.
 			</para>
 			<para>
-				The link ID will be of the form <parameter>{portletAppName}{PortletName}</parameter>. For example: <literal>ContentPortlet</literal> in <literal>content.war</literal>, will give <parameter>id="content<literal>ContentPortlet"</literal></parameter>
+				The link ID will be of the form <parameter>{portletAppName}{PortletName}</parameter>.
 			</para>
 			<para>
+				For example: <literal>ContentPortlet</literal> in <literal>content.war</literal>, will give <parameter>id="content<literal>ContentPortlet"</literal></parameter>
+			</para>
+			<para>
 				To define a new CSS file to include whenever a portlet is available on a portal page, the following fragment needs to be added in gatein-resources.xml
-<programlisting>&lt;portlet-skin&gt;
-  &lt;application-name&gt;portletAppName&lt;/application-name&gt;
-  &lt;portlet-name&gt;PortletName&lt;/portlet-name&gt;
-  &lt;skin-name&gt;Default&lt;/skin-name&gt;
-  &lt;CSS-path&gt;/skin/DefaultStylesheet.CSS&lt;/CSS-path&gt;
-&lt;/portlet-skin&gt;
-
-&lt;portlet-skin&gt;
-  &lt;application-name&gt;portletAppName&lt;/application-name&gt;
-  &lt;portlet-name&gt;PortletName&lt;/portlet-name&gt;
-  &lt;skin-name&gt;OtherSkin&lt;/skin-name&gt;
-  &lt;CSS-path&gt;/skin/OtherSkinStylesheet.CSS&lt;/CSS-path&gt;
-&lt;/portlet-skin&gt;
-</programlisting>
 			</para>
+
+<programlisting language="XML" role="XML"><![CDATA[<portlet-skin>
+  <application-name>portletAppName</application-name>
+  <portlet-name>PortletName</portlet-name>
+  <skin-name>Default</skin-name>
+  <CSS-path>/skin/DefaultStylesheet.CSS</CSS-path>
+</portlet-skin>
+
+<portlet-skin>
+  <application-name>portletAppName</application-name>
+  <portlet-name>PortletName</portlet-name>
+  <skin-name>OtherSkin</skin-name>
+  <CSS-path>/skin/OtherSkinStylesheet.CSS</CSS-path>
+</portlet-skin>]]></programlisting>
+
 			<para>
 				This will load the <literal>DefaultStylesheet.css</literal> when the Default skin is used and the <literal>OtherSkinStylesheet.css</literal> when the <literal>OtherSkin</literal> is used.
 			</para>
+
 			<note>
 				<title>Updating Portlet Skins</title>
 				<para>
-					If the current portal skin is not defined as part of the supported skins, then the portlet CSS class will not be loaded. It is recommended that portlet skins are updated whenever a new portal skin is created.
+					If the current portal skin is not defined as one of the supported skins, then the portlet CSS class will not be loaded. It is recommended that portlet skins are updated whenever a new portal skin is created.
 				</para>
 			</note>
 			<section id="sect-Reference_Guide-How_to_Create_New_Portlet_skins-Change_portlet_icons">
@@ -725,7 +687,7 @@
 				By default, CSS files are cached and their imports are merged into a single CSS file at the server side. This reduces the number of HTTP requests from the browser to the server.
 			</para>
 			<para>
-				The optimization code is quite simple as all the CSS files are parsed at the server startup and all the <literal>@import</literal> and <literal>url(...)</literal> references are rewritten to support a single flat file. The result is stored in a cache directly used from the <literal>ResourceRequestFilter</literal>.
+				The optimization code is quite simple as all the CSS files are parsed at the server start and all the <literal>@import</literal> and <literal>url(...)</literal> references are rewritten to support a single flat file. The result is stored in a cache directly used from the <literal>ResourceRequestFilter</literal>.
 			</para>
 			<para>
 				Although the optimization is useful for a production environment, it may be easier to deactivate this optimization while debugging stylesheets. Set the java system property <literal>exo.product.developing</literal> to <literal>true</literal> to disable the optimization.
@@ -739,7 +701,7 @@
 
 		<warning>
 			<para>
-				This option may cause display bugs with certain browsers (Internet Explorer, for example).
+				This option may cause display bugs in some browsers.
 			</para>
 		</warning>
 		</section>
@@ -763,26 +725,23 @@
 					</imageobject>
 				</mediaobject>
 				
-<programlisting role="HTML">
-&lt;div class="Parent"&gt;
-  &lt;div class="TopLeft"&gt;
-    &lt;div class="TopRight"&gt;
-      &lt;div class="TopCenter"&gt;&lt;span&gt;&lt;/span&gt;&lt;/div&gt;
-    &lt;/div&gt;
-  &lt;/div&gt;
-  &lt;div class="CenterLeft"&gt;
-    &lt;div class="CenterRight"&gt;
-      &lt;div class="CenterCenter"&gt;BODY&lt;/div&gt;
-    &lt;/div&gt;
-  &lt;/div&gt;
-  &lt;div class="BottomLeft"&gt;
-    &lt;div class="BottomRight"&gt;
-      &lt;div class="BottomCenter"&gt;&lt;span&gt;&lt;/span&gt;&lt;/div&gt;
-    &lt;/div&gt;
-  &lt;div&gt;
-&lt;/div&gt;
-</programlisting>
-			</section>
+<programlisting language="HTML" role="HTML"><![CDATA[<div class="Parent">
+  <div class="TopLeft">
+    <div class="TopRight">
+      <div class="TopCenter"><span></span></div>
+    </div>
+  </div>
+  <div class="CenterLeft">
+    <div class="CenterRight">
+      <div class="CenterCenter">BODY</div>
+    </div>
+  </div>
+  <div class="BottomLeft">
+    <div class="BottomRight">
+      <div class="BottomCenter"><span></span></div>
+    </div>
+  <div>
+</div>]]></programlisting>			</section>
 			
 			<section id="sect-Reference_Guide-Some_CSS_techniques-Left_margin_left_pattern">
 				<title>Left Margin Left Pattern</title>
@@ -794,16 +753,14 @@
 						<imagedata fileref="images/PortalDevelopment/Skinning/leftMarginPattern.png" format="PNG" width="303" />
 					</imageobject>
 				</mediaobject>
-				
-<programlisting role="HTML">
-&lt;div class="Parent"&gt;
-  &lt;div style="float: left; width: 100px"&gt;
-  &lt;/div&gt;
-  &lt;div style="margin-left: 105px;"&gt;
-  &lt;div&gt;
-  &lt;div style="clear: left"&gt;&lt;span&gt;&lt;/span&gt;&lt;/div&gt;
-&lt;/div&gt;
-</programlisting>
+
+<programlisting language="HTML" role="HTML"><![CDATA[<div class="Parent">
+  <div style="float: left; width: 100px">
+  </div>
+  <div style="margin-left: 105px;">
+  <div>
+  <div style="clear: left"><span></span></div>
+</div>]]></programlisting>
 			</section>
 
 		</section>

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-XML_Resources_Bundles">
 	<title>XML Resources Bundles</title>
 	<section id="sect-Reference_Guide-XML_Resources_Bundles-Motivation">
-		<title>Motivation</title>
+		<title>Overview</title>
 		<para>
 			Resource bundles are usually stored in property files. However, as property files are plain files, issues with the encoding of the file may arise. The XML resource bundle format has been developed to provide an alternative to property files.
 		</para>
@@ -32,7 +32,7 @@
 	<section id="sect-Reference_Guide-XML_Resources_Bundles-XML_format">
 		<title>XML format</title>
 		<para>
-			The XML format is very simple and has been developed based on the <emphasis>DRY</emphasis> (Don't Repeat Yourself) principle. Usually resource bundle keys are hierarchically defined and we can leverage the hierarchic nature of the XML for that purpose. Here is an example of turning a property file into an XML resource bundle file:
+			The XML format is very simple and has been developed based on the <emphasis>DRY</emphasis> (<ulink type="http" url="http://www.artima.com/intv/dry.html">Don't Repeat Yourself</ulink>) principle. Usually resource bundle keys are hierarchically defined and we can leverage the hierarchic nature of the XML for that purpose. Here is an example of turning a property file into an XML resource bundle file:
 		</para>
 		
 <programlisting>UIAccountForm.tab.label.AccountInputSet = ...
@@ -46,29 +46,29 @@
 UIAccountForm.action.Reset= ...
 </programlisting>
 		
-<programlisting role="XML">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;bundle&gt;
-  &lt;UIAccountForm&gt;
-    &lt;tab&gt;
-      &lt;label&gt;
-        &lt;AccountInputSet&gt;...&lt;/AccountInputSet&gt;
-        &lt;UIUserProfileInputSet&gt;...&lt;/UIUserProfileInputSet&gt;
-      &lt;/label&gt;
-    &lt;/tab&gt;
-    &lt;label&gt;
-      &lt;Profile&gt;...&lt;/Profile&gt;
-      &lt;HomeInfo&gt;...&lt;/HomeInfo&gt;
-      &lt;BusinessInfo&gt;...&lt;/BusinessInfo&gt;
-      &lt;password&gt;...&lt;/password&gt;
-      &lt;Confirmpassword&gt;...&lt;/Confirmpassword&gt;
-      &lt;email&gt;...&lt;/email&gt;
-    &lt;/label&gt;
-    &lt;action&gt;
-      &lt;Reset&gt;...&lt;/Reset&gt;
-    &lt;/action&gt;
-  &lt;/UIAccountForm&gt;
-&lt;/bundle&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<bundle>
+  <UIAccountForm>
+    <tab>
+      <label>
+        <AccountInputSet>...</AccountInputSet>
+        <UIUserProfileInputSet>...</UIUserProfileInputSet>
+      </label>
+    </tab>
+    <label>
+      <Profile>...</Profile>
+      <HomeInfo>...</HomeInfo>
+      <BusinessInfo>...</BusinessInfo>
+      <password>...</password>
+      <Confirmpassword>...</Confirmpassword>
+      <email>...</email>
+    </label>
+    <action>
+      <Reset>...</Reset>
+    </action>
+  </UIAccountForm>
+</bundle>]]></programlisting>
+
 	</section>
 	
 	<section id="sect-Reference_Guide-XML_Resources_Bundles-Portal_Support">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -14,6 +14,6 @@
 	<xi:include href="PortalDevelopment/RTLFramework.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="PortalDevelopment/XMLResourceBundles.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="PortalDevelopment/JavascriptInterApplicationCommunication.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-<!--	<xi:include href="PortalDevelopment/JavascriptConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+<!--	<xi:include href="PortalDevelopment/JavascriptConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> File has not been edited. Noted for later release-->
 </part>
 

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,15 +1,15 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Bridge_Configuration">
 	<title>Bridge Configuration</title>
 	<para>
-		The 329 specification is aimed at making the developers life as easy as possible with JSF+Portlet development. You will see below that there are minimal settings to getting any JSF web application up and running in the Portal environment.
+		The 329 specification is aimed at making the developer's life as easy as possible with JSF+Portlet development. You will see below that there are minimal settings to getting any JSF web application up and running in the Portal environment.
 	</para>
 	<para>
-		If you are starting from scratch, we highly recommend you use the <xref linkend="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes" />.
+		If you are new to these concepts, we highly recommend you refer to <xref linkend="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes" />.
 	</para>
 	<section id="sect-Reference_Guide-Bridge_Configuration-Core_Setup_and_Configuration">
 		<title>Core Setup and Configuration</title>
@@ -19,113 +19,119 @@
 				The basic JSR-329 portlet configuration.
 			</para>
 			
-<programlisting role="XML">
-      &lt;portlet&gt;
-         &lt;portlet-name&gt;yourPortletName&lt;/portlet-name&gt;
-         &lt;portlet-class&gt;
+<programlisting language="XML" role="XML"><![CDATA[
+      <portlet>
+         <portlet-name>yourPortletName</portlet-name>
+         <portlet-class>
             javax.portlet.faces.GenericFacesPortlet
-         &lt;/portlet-class&gt;
+         </portlet-class>
 
-         &lt;init-param&gt;
-            &lt;name&gt;javax.portlet.faces.defaultViewId.view&lt;/name&gt;
-            &lt;value&gt;/welcome.xhtml&lt;/value&gt;
-         &lt;/init-param&gt;
+         <init-param>
+            <name>javax.portlet.faces.defaultViewId.view</name>
+            <value>/welcome.xhtml</value>
+         </init-param>
 
-         &lt;init-param&gt;
-            &lt;name&gt;javax.portlet.faces.defaultViewId.edit&lt;/name&gt;
-            &lt;value&gt;/jsf/edit.xhtml&lt;/value&gt;
-         &lt;/init-param&gt;
+         <init-param>
+            <name>javax.portlet.faces.defaultViewId.edit</name>
+            <value>/jsf/edit.xhtml</value>
+         </init-param>
 
-         &lt;init-param&gt;
-            &lt;name&gt;javax.portlet.faces.defaultViewId.help&lt;/name&gt;
-            &lt;value&gt;/jsf/help.xhtml&lt;/value&gt;
-         &lt;/init-param&gt;
-</programlisting>
+         <init-param>
+            <name>javax.portlet.faces.defaultViewId.help</name>
+            <value>/jsf/help.xhtml</value>
+         </init-param>
+]]></programlisting>
 			<para>
-				When preserveActionParams is set to TRUE, the bridge must maintain any request parameters assigned during the portlet's action request. The request parameters are maintained in the<emphasis role="italics">"bridge request scope"</emphasis>. When this attribute isn't present or is FALSE the action's request parameters are only maintained for the duration of the <emphasis role="italics">portlet request scope</emphasis>.
+				When <parameter>preserveActionParams</parameter> is set to <parameter>TRUE</parameter>, the bridge must maintain any request parameters assigned during the portlet's action request.
 			</para>
+			<para>
+				The request parameters are maintained in the<emphasis>"bridge request scope"</emphasis>. When this attribute is not present or is <parameter>FALSE</parameter> the action's request parameters are only maintained for the duration of the <emphasis>portlet request scope</emphasis>.
+			</para>
 			
-<programlisting role="XML">
-      &lt;init-param&gt;
-         &lt;name&gt;javax.portlet.faces.preserveActionParams&lt;/name&gt;
-         &lt;value&gt;true&lt;/value&gt;
-      &lt;/init-param&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+      <init-param>
+         <name>javax.portlet.faces.preserveActionParams</name>
+         <value>true</value>
+      </init-param>
+]]></programlisting>
 		</section>
 		
 		<section id="sect-Reference_Guide-Core_Setup_and_Configuration-faces_config.xml">
 			<title>faces-config.xml</title>
 			<para>
-				The PortletViewHandler ensures that each JSF portlet instance is properly namespaced.
+				The <parameter>PortletViewHandler</parameter> ensures that each JSF portlet instance is properly namespaced.
 			</para>
 			
-<programlisting role="XML">
-        &lt;faces-config&gt;
-            &lt;application&gt;
-               &lt;view-handler&gt;
+<programlisting language="XML" role="XML"><![CDATA[
+        <faces-config>
+            <application>
+               <view-handler>
                   org.jboss.portletbridge.application.PortletViewHandler
-               &lt;/view-handler&gt;
-               &lt;state-manager&gt;org.jboss.portletbridge.application.PortletStateManager&lt;/state-manager&gt;
-            &lt;/application&gt;
+               </view-handler>
+               <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager>
+            </application>
             ...
-</programlisting>
+]]></programlisting>
 		</section>
 		
 		<section id="sect-Reference_Guide-Core_Setup_and_Configuration-Facelets_Configuration">
 			<title>Facelets Configuration</title>
 			<para>
-				The following web.xml setting is only for Facelets based applications
+				The following <filename>web.xml</filename> setting is only for <literal>Facelets</literal> based applications
 			</para>
 			<section id="sect-Reference_Guide-Facelets_Configuration-web.xml">
 				<title>web.xml</title>
-				
-<programlisting role="XML">
-        &lt;web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<programlisting language="XML" role="XML"><![CDATA[
+        <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-                 version="2.4"&gt;
-            ...
-            &lt;!-- This is optional parameters for a facelets based application --&gt;
-            &lt;context-param&gt;
-                &lt;param-name&gt;org.ajax4jsf.VIEW_HANDLERS&lt;/param-name&gt;
-                &lt;param-value&gt;org.jboss.portletbridge.application.FaceletPortletViewHandler&lt;/param-value&gt;
-            &lt;/context-param&gt;
-</programlisting>
-				<para>
-				</para>
+                 version="2.4">
+            ...-->
+            <!-- This is optional parameters for a facelets based application -->
+           <!-- <context-param>
+                <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+                <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value>
+            </context-param>
+]]></programlisting>
 				
-<programlisting role="XML">
-             &lt;context-param&gt;
-                &lt;param-name&gt;javax.portlet.faces.RENDER_POLICY&lt;/param-name&gt;
-                &lt;param-value&gt;
+<programlisting language="XML" role="XML"><![CDATA[
+             <context-param>
+                <param-name>javax.portlet.faces.RENDER_POLICY</param-name>
+                <param-value>
                     ALWAYS_DELEGATE
-                &lt;/param-value&gt;
-            &lt;/context-param&gt;
+                </param-value>
+            </context-param>
             ...
-        &lt;/web-app&gt;
-</programlisting>
-				<note>
-					<title>RenderPolicy Options</title>
+        </web-app>
+]]></programlisting>
+
+			<variablelist>
+			<title>RenderPolicy Options</title>
+			  <varlistentry>
+				<term>ALWAYS_DELEGATE</term>
+				<listitem>
 					<para>
-						<itemizedlist>
-							<listitem>
-								<para>
-									<literal>ALWAYS_DELEGATE</literal> Indicates the bridge should not render the view itself but rather always delegate the rendering.
-								</para>
-							</listitem>
-							<listitem>
-								<para>
-									<literal>NEVER_DELEGATE</literal> Indicates the bridge should always render the view itself and never delegate.
-								</para>
-							</listitem>
-							<listitem>
-								<para>
-									<literal>DEFAULT</literal> Directs the bridge to first delegate the render and if and only if an Exception is thrown then render the view based on its own logic. If the configuration parameter is not present or has an invalid value the bridge renders using default behavior. I.e. as if DEFAULT is set.
-								</para>
-							</listitem>
-						</itemizedlist>
+						Indicates the bridge should not render the view itself but rather always delegate the rendering.
 					</para>
-				</note>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>NEVER_DELEGATE</term>
+				<listitem>
+					<para>
+						Indicates the bridge should always render the view itself and never delegate.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>DEFAULT</term>
+				<listitem>
+					<para>
+						Directs the bridge to first delegate the render and if and only if an Exception is thrown then render the view based on its own logic. If the configuration parameter is not present or has an invalid value the bridge renders using default behavior. I.e. as if DEFAULT is set.
+					</para>
+				</listitem>
+			</varlistentry>
+			</variablelist>
 			</section>
 
 		</section>
@@ -133,26 +139,27 @@
 		<section id="sect-Reference_Guide-Core_Setup_and_Configuration-JSP_Only_Configuration">
 			<title>JSP Only Configuration</title>
 			<para>
-				The following web.xml setting is only for JSP based applications. Download the demo application <ulink url="http://anonsvn.jboss.org/repos/portletbridge/trunk/examples/jsf-ri/1.2-basic/">here</ulink>.
+				The following <filename>web.xml</filename> setting is only for JSP based applications. Download the demonstration application <ulink url="http://anonsvn.jboss.org/repos/portletbridge/trunk/examples/jsf-ri/1.2-basic/">here</ulink>.
 			</para>
 			<section id="sect-Reference_Guide-JSP_Only_Configuration-web.xml">
 				<title>web.xml</title>
 				
-<programlisting role="XML">
-        &lt;web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<programlisting language="XML" role="XML"><![CDATA[
+        <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-                 version="2.4"&gt;
+                 version="2.4">
 
-             &lt;context-param&gt;
-                &lt;param-name&gt;javax.portlet.faces.renderPolicy&lt;/param-name&gt;
-                &lt;param-value&gt;
+             <context-param>
+                <param-name>javax.portlet.faces.renderPolicy</param-name>
+                <param-value>
                     NEVER_DELEGATE
-                &lt;/param-value&gt;
-            &lt;/context-param&gt;
+                </param-value>
+            </context-param>
             ...
-        &lt;/web-app&gt;
-</programlisting>
+        </web-app>
+]]></programlisting>
+
 			</section>
 
 		</section>
@@ -160,16 +167,15 @@
 		<section id="sect-Reference_Guide-Core_Setup_and_Configuration-JSR_329">
 			<title>JSR-329</title>
 			<para>
-				The Jboss Portlet Bridge can be used with a any compatible implementation ( for example, MyFaces implementation). Simply put the following into web.xml :
+				The Jboss Portlet Bridge can be used with a any compatible implementation (for example, <literal>MyFaces</literal> implementation). Simply put the following into <filename>web.xml</filename>:
 			</para>
 			
-<programlisting role="XML">
-
-    &lt;context-param&gt;
-        &lt;param-name&gt;javax.portlet.faces.BridgeImplClass&lt;/param-name&gt;
-        &lt;param-value&gt;org.apache.myfaces.portlet.faces.bridge.BridgeImpl&lt;/param-value&gt;
-    &lt;/context-param&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+    <context-param>
+        <param-name>javax.portlet.faces.BridgeImplClass</param-name>
+        <param-value>org.apache.myfaces.portlet.faces.bridge.BridgeImpl</param-value>
+    </context-param>
+]]></programlisting>
 		</section>
 
 	</section>
@@ -180,65 +186,69 @@
 		<section id="sect-Reference_Guide-RichFaces_Setup_and_Configuration_Options-web.xml">
 			<title>web.xml</title>
 			<para>
-				The following configuration is designated for portlets using the RichFaces library. These settings will vary based on your individual needs. See <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/docs/devguide/en/html/ArchitectureOverview.html#ScriptsandStylesLoadStrategy"> this section</ulink> of the RichFaces documentation for more details.
+				The following configuration is designated for portlets using the <application>RichFaces</application> library. These settings will vary based on your individual needs.
 			</para>
 			<para>
-				Sometimes it is better to use the "ALL" load strategy in portlets so you do not need to worry about loading the "framework.pack.js" and "ui.pack.js" files manually in your portlet header.
+				See <ulink url="http://www.jboss.org/file-access/default/members/jbossrichfaces/freezone/docs/devguide/en/html/ArchitectureOverview.html#ScriptsandStylesLoadStrategy"> this section</ulink> of the <application>RichFaces</application> documentation for more details.
 			</para>
-			
-<programlisting role="XML">
-            &lt;context-param&gt;
-                &lt;param-name&gt;org.richfaces.LoadStyleStrategy&lt;/param-name&gt;
-                &lt;param-value&gt;ALL&lt;/param-value&gt;
-            &lt;/context-param&gt;
-            &lt;context-param&gt;
-                &lt;param-name&gt;org.richfaces.LoadScriptStrategy&lt;/param-name&gt;
-                &lt;param-value&gt;ALL&lt;/param-value&gt;
-            &lt;/context-param&gt;
-</programlisting>
+			<para>
+				Sometimes it is better to use the "<parameter>ALL</parameter>" load strategy in portlets so you do not need to worry about loading the "framework.pack.js" and "ui.pack.js" files manually in your portlet header.
+			</para>
+
+<programlisting language="XML" role="XML"><![CDATA[
+            <context-param>
+                <param-name>org.richfaces.LoadStyleStrategy</param-name>
+                <param-value>ALL</param-value>
+            </context-param>
+            <context-param>
+                <param-name>org.richfaces.LoadScriptStrategy</param-name>
+                <param-value>ALL</param-value>
+            </context-param>
+]]></programlisting>
 			<note>
 				<para>
-					If you use the "NONE" strategy, you must include the following scripts in your portlet or portal page header. If you are using JBoss Portal, you can add this to the jboss-portlet.xml file.
+					If you use the "<parameter>NONE</parameter>" strategy, you must include the following scripts in your portlet or portal page header. If you are using <application>JBoss Portal</application>, you can add this to the <filename>jboss-portlet.xml</filename> file.
 				</para>
 			</note>
 			<para>
-				The <literal>org.ajax4jsf.RESOURCE_URI_PREFIX</literal> configuration cross references the path to your scripts below. These settings are required for RichFaces using the "NONE" strategy.
+				The <literal>org.ajax4jsf.RESOURCE_URI_PREFIX</literal> configuration cross-references the path to your scripts below. These settings are required for <application>RichFaces</application> using the "<parameter>NONE</parameter>" strategy.
 			</para>
 			
-<programlisting role="XML">
-    &lt;script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"&gt;&lt;/script&gt;
-    &lt;script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"&gt;&lt;/script&gt;
-    &lt;link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+    <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script>
+    <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script>
+    <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/>
+]]></programlisting>
 			<para>
-				Seam automatically configures your Ajax4JSF Filter, so if you are running a Seam portlet, you do not need the following Filter config. (But you do need the RESOURCE_URI_PREFIX no matter what)
+				<application>Seam</application> automatically configures your Ajax4JSF Filter, so if you are running a <application>Seam</application> portlet, you do not need the following Filter configuration (however, you do need the <literal>RESOURCE_URI_PREFIX</literal> no matter what).
 			</para>
-			
-<programlisting role="XML">
-            &lt;context-param&gt;
-                &lt;param-name&gt;org.ajax4jsf.RESOURCE_URI_PREFIX&lt;/param-name&gt;
-                &lt;param-value&gt;rfRes&lt;/param-value&gt;
-            &lt;/context-param&gt;
 
-            &lt;filter&gt;
-                &lt;display-name&gt;Ajax4jsf Filter&lt;/display-name&gt;
-                &lt;filter-name&gt;ajax4jsf&lt;/filter-name&gt;
-                &lt;filter-class&gt;org.ajax4jsf.Filter&lt;/filter-class&gt;
-            &lt;/filter&gt;
+<programlisting language="XML" role="XML"><![CDATA[
+            <context-param>
+                <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name>
+                <param-value>rfRes</param-value>
+            </context-param>
 
-            &lt;filter-mapping&gt;
-                &lt;filter-name&gt;ajax4jsf&lt;/filter-name&gt;
-                &lt;servlet-name&gt;FacesServlet&lt;/servlet-name&gt;
-                &lt;dispatcher&gt;FORWARD&lt;/dispatcher&gt;
-                &lt;dispatcher&gt;REQUEST&lt;/dispatcher&gt;
-                &lt;dispatcher&gt;INCLUDE&lt;/dispatcher&gt;
-            &lt;/filter-mapping&gt;
+            <filter>
+                <display-name>Ajax4jsf Filter</display-name>
+                <filter-name>ajax4jsf</filter-name>
+                <filter-class>org.ajax4jsf.Filter</filter-class>
+            </filter>
+
+            <filter-mapping>
+                <filter-name>ajax4jsf</filter-name>
+                <servlet-name>FacesServlet</servlet-name>
+                <dispatcher>FORWARD</dispatcher>
+                <dispatcher>REQUEST</dispatcher>
+                <dispatcher>INCLUDE</dispatcher>
+            </filter-mapping>
             ...
-        &lt;/web-app&gt;
-</programlisting>
+        </web-app>
+]]></programlisting>
+
 		</section>
 		
-		<!--  <section>
+		<!--  DO NOT UNCOMMENT <section>
         <title>jboss-portlet.xml</title>
         <para>
             To avoid scripts loading more than once from different portlet windows you can define additional scripts in
@@ -255,6 +265,7 @@
     ]]></programlisting>
 
     </section>  -->
+
 	</section>
 	
 	<section id="sect-Reference_Guide-Bridge_Configuration-Seam_Setup_and_Configuration_Options">
@@ -262,81 +273,87 @@
 		<section id="sect-Reference_Guide-Seam_Setup_and_Configuration_Options-Configuration">
 			<title>Configuration</title>
 			<para>
-				The ExceptionHandler is used to clean Seam contexts and transactions after errors.
+				The <literal>ExceptionHandler</literal> is used to clean <application>Seam</application> contexts and transactions after errors.
 			</para>
 			
-<programlisting role="XML">
-      &lt;context-param&gt;
-         &lt;param-name&gt;org.jboss.portletbridge.ExceptionHandler&lt;/param-name&gt;
-         &lt;param-value&gt;
+<programlisting language="XML" role="XML"><![CDATA[
+      <context-param>
+         <param-name>org.jboss.portletbridge.ExceptionHandler</param-name>
+         <param-value>
             org.jboss.portletbridge.SeamExceptionHandlerImpl
-         &lt;/param-value&gt;
-      &lt;/context-param&gt;
-</programlisting>
+         </param-value>
+      </context-param>
+]]></programlisting>
 			<para>
-				If you are using this bridge version from 2.0.0.BETA through 2.0.0.CR1, you must define the following web.xml parameter to use the JBoss Portlet Bridge provided Seam Phase Listener. This is done by the bridge automatically (if needed) in 2.0.0.FINAL.
+				If you are using this bridge version from <literal>2.0.0.BETA</literal> through <literal>2.0.0.CR1</literal>, you must define the following <filename>web.xml</filename> parameter to use the JBoss Portlet Bridge provided Seam Phase Listener. This is done by the bridge automatically (if needed) in <literal>2.0.0.FINAL</literal>.
 			</para>
 			
-<programlisting role="XML">
-      &lt;context-param&gt;
-        &lt;param-name&gt;javax.faces.LIFECYCLE_ID&lt;/param-name&gt;
-        &lt;param-value&gt;SEAM_PORTLET&lt;/param-value&gt;
-      &lt;/context-param&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+      <context-param>
+        <param-name>javax.faces.LIFECYCLE_ID</param-name>
+        <param-value>SEAM_PORTLET</param-value>
+      </context-param>
+]]></programlisting>
 		</section>
 
 	</section>
 	
 	<section id="sect-Reference_Guide-Bridge_Configuration-Portlet_2.0_Coordination">
 		<title>Portlet 2.0 Coordination</title>
-		<para>
-			One very important thing to note before using either of the following mechanisms, is that you must have the proper 2.0 schema and xsd definition at the top of your portlet.xml.
-		</para>
+		<note>
+			<title>Schema and XSD Definitions</title>
+				<para>
+					It is important to ensure, before using either of the following mechanisms, that the proper 2.0 schema and xsd are defined at the top of your <filename>portlet.xml</filename>.
+				</para>
+		</note>
 		
-<programlisting role="XML">
-    &lt;portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+<programlisting language="XML" role="XML"><![CDATA[
+    <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
              version="2.0"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd
-      http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"&gt;
-</programlisting>
+      http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
+]]></programlisting>
+
 		<section id="sect-Reference_Guide-Portlet_2.0_Coordination-Sending_and_Receiving_Events">
 			<title>Sending and Receiving Events</title>
 			<section id="sect-Reference_Guide-Sending_and_Receiving_Events-Configuration">
 				<title>Configuration</title>
 				<para>
-					Just like with any portlet 2.0 event consumer and receiver, you must define them in the portlet.xml. To see a working example, checkout the Seam Booking Demo portlet. <ulink url="http://anonsvn.jboss.org/repos/portletbridge/tags/2.0.0.FINAL/examples/seam/booking/" />
+					Just like with any portlet 2.0 event consumer and receiver, you must define them in the <filename>portlet.xml</filename>.
 				</para>
 				<para>
-					You must also define the following init params in your portlet.xml.
+					To see a working example, checkout the Seam Booking Demo portlet. <ulink url="http://anonsvn.jboss.org/repos/portletbridge/tags/2.0.0.FINAL/examples/seam/booking/" />
 				</para>
+				<para>
+					You must also define the following <emphasis>init params</emphasis> in your <filename>portlet.xml</filename>.
+				</para>
 				
-<programlisting role="XML">
-    &lt;/init-param&gt;
-      &lt;init-param&gt;
-      &lt;name&gt;javax.portlet.faces.autoDispatchEvents&lt;/name&gt;
-      &lt;value&gt;true&lt;/value&gt;
-    &lt;/init-param&gt;
-      &lt;init-param&gt;
-      &lt;name&gt;javax.portlet.faces.bridgeEventHandler&lt;/name&gt;
-      &lt;value&gt;org.foo.eventhandler&lt;/value&gt;
-    &lt;/init-param&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+    </init-param>
+      <init-param>
+      <name>javax.portlet.faces.autoDispatchEvents</name>
+      <value>true</value>
+    </init-param>
+      <init-param>
+      <name>javax.portlet.faces.bridgeEventHandler</name>
+      <value>org.foo.eventhandler</value>
+    </init-param>
+]]></programlisting>
 				<para>
-					For now, you must dipatch the event in the JSF or Seam backing bean. Future versions on the 2.0 bridge will automate the dispatching and consuming of events.
+					While future versions on the 2.0 bridge will automate the dispatching and consuming of events, at the moments you must dispatch the event in the JSF or Seam backing bean.
 				</para>
 				
-<programlisting role="XML">
-   if (response instanceof StateAwareResponse) {
+<programlisting language="XML" role="XML"><![CDATA[   if (response instanceof StateAwareResponse) {
         StateAwareResponse stateResponse = (StateAwareResponse) response;
         stateResponse.setEvent(Foo.QNAME, new Bar());
     }
-</programlisting>
+]]></programlisting>
 				<para>
-					Then you must also create the event handler class by implementing the BridgeEventHandler interface to process the event payload.
+					You must also create the event handler class by implementing the <literal>BridgeEventHandler</literal> interface to process the event payload.
 				</para>
 				
-<programlisting role="XML">
+<programlisting language="XML" role="XML"><![CDATA[
    public class BookingEventHandler implements BridgeEventHandler
     {
        public EventNavigationResult handleEvent(FacesContext context, Event event)
@@ -345,7 +362,7 @@
        }
 
     }
-</programlisting>
+]]></programlisting>
 			</section>
 
 		</section>
@@ -355,60 +372,63 @@
 			<section id="sect-Reference_Guide-Public_Render_Parameters-Configuration">
 				<title>Configuration</title>
 				<para>
-					Public Render Parameters (or PRPs) are one of the most powerful and simple Portlet 2.0 features. Several portlets (JSF or not) can share the same render parameters. This feature can be use to present a cohesive UI to the user across all portlets on the page (i.e. using an employee ID to display relative data).
+					Public Render Parameters (or PRPs) are one of the most powerful and simple Portlet 2.0 features. Several portlets (JSF or otherwise) can share the same render parameters. This feature can be use to present a cohesive UI to the user across all portlets on the page. An example would be using an employee ID to display relative data.
 				</para>
 				<para>
-					The bridge maps a render parameter to a backing bean using settings in your faces-config.xml and portlet.xml. A clear and working example can be found in the Seam Booking Demo portlet. <ulink url="http://anonsvn.jboss.org/repos/portletbridge/tags/2.0.0.FINAL/examples/seam/booking/" />
+					The bridge maps a render parameter to a backing bean using settings in your <filename>faces-config.xml</filename> and <filename>portlet.xml</filename>.
 				</para>
 				<para>
-					You must define the following init params in your portlet.xml.
+					A clear and working example can be found in the Seam Booking Demo portlet. <ulink url="http://anonsvn.jboss.org/repos/portletbridge/tags/2.0.0.FINAL/examples/seam/booking/" />
 				</para>
+				<para>
+					You must define the following <emphasis>init params</emphasis> in your <filename>portlet.xml</filename>.
+				</para>
 				
-<programlisting role="XML">
-    &lt;init-param&gt;
-      &lt;name&gt;javax.portlet.faces.bridgePublicRenderParameterHandler&lt;/name&gt;
-      &lt;value&gt;org.foo.PRPHandler&lt;/value&gt;
-    &lt;/init-param&gt;
+<programlisting language="XML" role="XML"><![CDATA[
+    <init-param>
+      <name>javax.portlet.faces.bridgePublicRenderParameterHandler</name>
+      <value>org.foo.PRPHandler</value>
+    </init-param>
     ...
-    &lt;supported-public-render-parameter&gt;myCoolPRP&lt;/supported-public-render-parameter&gt;
-</programlisting>
+    <supported-public-render-parameter>myCoolPRP</supported-public-render-parameter>
+]]></programlisting>
 				<para>
-					Create a managed bean and public-parameter-mappings in your faces-config.xml. This should be a basic bean that you can bind the passed parameter to a string with getter and setter.
+					Create a managed bean and <literal>public-parameter-mappings</literal> in your <filename>faces-config.xml</filename>. This should be a basic bean that you can bind the passed parameter to a string with <emphasis>getter</emphasis> and <emphasis>setter</emphasis>.
 				</para>
 				
-<programlisting role="XML">
-     &lt;managed-bean&gt;
-        &lt;managed-bean-name&gt;bookingPRP&lt;/managed-bean-name&gt;
-        &lt;managed-bean-class&gt;your.class.Name&lt;/managed-bean-class&gt;
-        &lt;managed-bean-scope&gt;session&lt;/managed-bean-scope&gt;
-    &lt;/managed-bean&gt;
+<programlisting language="XML" role="XML"><![CDATA[
+     <managed-bean>
+        <managed-bean-name>bookingPRP</managed-bean-name>
+        <managed-bean-class>your.class.Name</managed-bean-class>
+        <managed-bean-scope>session</managed-bean-scope>
+    </managed-bean>
 
-    &lt;application&gt;
-       &lt;application-extension&gt;
-          &lt;bridge:public-parameter-mappings&gt;
-             &lt;bridge:public-parameter-mapping&gt;
-                &lt;parameter&gt;"the name of your portlet":hotelName&lt;/parameter&gt;
-                &lt;model-el&gt;#{bookingPRP.hotelName}&lt;/model-el&gt;
-              &lt;/bridge:public-parameter-mapping&gt;
-           &lt;/bridge:public-parameter-mappings&gt;
-        &lt;/application-extension&gt;
-    &lt;/application&gt;
-</programlisting>
+    <application>
+       <application-extension>
+          <bridge:public-parameter-mappings>
+             <bridge:public-parameter-mapping>
+                <parameter>"the name of your portlet":hotelName</parameter>
+                <model-el>#{bookingPRP.hotelName}</model-el>
+              </bridge:public-parameter-mapping>
+           </bridge:public-parameter-mappings>
+        </application-extension>
+    </application>
+]]></programlisting>
 				<para>
 					You must set the parameter in the JSF or Seam backing bean, if you are providing one from your portlet.
 				</para>
 				
-<programlisting role="XML">
+<programlisting language="XML" role="XML"><![CDATA[
    if (response instanceof StateAwareResponse) {
         StateAwareResponse stateResponse = (StateAwareResponse) response;
         stateResponse.setRenderParameter("hotelName",selectedHotel.getName());
     }
-</programlisting>
+]]></programlisting>
 				<para>
-					Then you must also implement the BridgePublicRenderParameterHandler interface to process any updates from the received parameter.
+					Then you must also implement the <literal>BridgePublicRenderParameterHandler</literal> interface to process any updates from the received parameter.
 				</para>
 				
-<programlisting role="XML">
+<programlisting language="XML" role="XML"><![CDATA[
    public void processUpdates(FacesContext context)
    {
       ELContext elContext = context.getELContext();
@@ -420,7 +440,7 @@
 
     }
    }
-</programlisting>
+]]></programlisting>
 			</section>
 
 		</section>
@@ -430,29 +450,29 @@
 			<section id="sect-Reference_Guide-Serving_Your_JSF_Resources_in_a_Portlet-Configuration">
 				<title>Configuration</title>
 				<para>
-					We have setup a few examples to show you how to use EL and a simple bean that will allow you to use the portlet resource serving mechanism within a JSF portlet.
+					We have setup a few examples to show you how to use <literal>EL</literal> and a simple bean that will allow you to use the portlet resource serving mechanism within a JSF portlet.
 				</para>
 				<para>
 					In <ulink url="http://anonsvn.jboss.org/repos/portletbridge/tags/2.0.0.CR1/examples/richfaces/richfaces-demo/src/main/java/org/richfaces/demo/common/ResourceBean.java">ResourceBean.java</ulink>, you can see a very simple implementations of a Map object that uses the bridge to get and encode a resource url served from the portlets web application.
 				</para>
 				<para>
-					So, when you have the normal "/images", "/styles" and other resource folders in your web app, you can use the following EL expression to serve them in your JSF application.
+					So, when you have the normal "<filename>/images</filename>", "<filename>/styles</filename>" and other resource folders in your web application, you can use the following <literal>EL</literal> expression to serve them in your JSF application.
 				</para>
 				
-<programlisting role="XML">
+<programlisting language="XML" role="XML">
     #{resource['/img/the-path-to-my-image.png']}
 </programlisting>
 				<para>
-					Just copy the ResourceBean.java code above, and add an entry to you faces-config.xml for the bean:
+					Just copy the <literal>ResourceBean.java</literal> code above, and add an entry to your <filename>faces-config.xml</filename> for the bean:
 				</para>
 				
-<programlisting role="XML">
-    &lt;managed-bean&gt;
-      &lt;managed-bean-name&gt;resource&lt;/managed-bean-name&gt;
-      &lt;managed-bean-class&gt;org.richfaces.demo.common.ResourceBean&lt;/managed-bean-class&gt;
-      &lt;managed-bean-scope&gt;application&lt;/managed-bean-scope&gt;
-     &lt;/managed-bean&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+    <managed-bean>
+      <managed-bean-name>resource</managed-bean-name>
+      <managed-bean-class>org.richfaces.demo.common.ResourceBean</managed-bean-class>
+      <managed-bean-scope>application</managed-bean-scope>
+     </managed-bean>
+]]></programlisting>
 			</section>
 
 		</section>

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,21 +1,27 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge">
 	<title>Getting started with JBoss Portlet Bridge</title>
 	<para>
-		JBoss Portlet Bridge not only gives you the ability to run JSF web applications in a portlet, but also gives you the benefit of running supported JBoss frameworks like Seam and RichFaces.
+		JBoss Portlet Bridge not only gives you the ability to run JSF web applications in a portlet, but also gives you the benefit of running supported JBoss frameworks like <application>Seam</application> and <application>RichFaces</application>.
 	</para>
 	<section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Whats_New_in_2.0">
 		<title>What's New in 2.0?</title>
 		<section id="sect-Reference_Guide-Whats_New_in_2.0-Eventing">
 			<title>Eventing</title>
 			<para>
-				The bridge considers a portlet event a model event. I.e. the event is targeted to the applications data model not its view. As JSF events primarily concern its view, the bridge processes the portlet events manually, however provisions are made to make sure that any model changes that result from processing the event are updated in the view. Since event payloads are arbitrarily complex, the manual processing of the data, though managed by the bridge, is left to the (portlet) application to support.
+				The bridge considers a portlet event a model event. The event is targeted to the applications data model, not its view.
 			</para>
 			<para>
+				As JSF events primarily concern its view, the bridge processes the portlet events manually, however provisions are made to ensure that any model changes resulting from processing the event are updated in the view.
+			</para>
+			<para>
+				Since event payloads are arbitrarily complex, the manual processing of the data, though managed by the bridge, is left to the (portlet) application to support.
+			</para>
+			<para>
 				See <xref linkend="sect-Reference_Guide-Portlet_2.0_Coordination-Sending_and_Receiving_Events" /> for details and examples.
 			</para>
 		</section>
@@ -23,9 +29,15 @@
 		<section id="sect-Reference_Guide-Whats_New_in_2.0-Portlet_Served_Resources">
 			<title>Portlet Served Resources</title>
 			<para>
-				The bridge deals with portlet served resources in one of two ways. If the request is for a non-JSF resource, the bridge handles the request by acquiring a request dispatcher and forwarding the request to the named resource. If the request is for a JSF resource, the bridge runs the full JSF lifecycle ensuring that data is processed and the resource (markup) is rendered.
+				The bridge deals with portlet served resources in one of two ways:
 			</para>
 			<para>
+				If the request is for a non-JSF resource, the bridge handles the request by acquiring a request dispatcher and forwarding the request to the named resource. 
+			</para>
+			<para>
+				If the request is for a JSF resource, the bridge runs the full JSF lifecycle ensuring that data is processed and the resource (markup) is rendered.
+			</para>
+			<para>
 				See <xref linkend="sect-Reference_Guide-Portlet_2.0_Coordination-Serving_Your_JSF_Resources_in_a_Portlet" /> for details and examples.
 			</para>
 		</section>
@@ -33,9 +45,18 @@
 		<section id="sect-Reference_Guide-Whats_New_in_2.0-Public_Render_Parameters">
 			<title>Public Render Parameters</title>
 			<para>
-				The bridge automates the processing of public render parameters. A public render parameter can be mapped to an object's accessor (get/set method) designed to handle a String representation of the value via a Faces ValueExpression. When a new public render parameter value is received in a request, the bridge sets the value by calling the ValueExpression's setValue(). At the end of a request, if the current value of any mapped public render parameter doesn't match the current incoming value, the bridge sets the new value in an outgoing public render parameter (if feasible in the given phase).
+				The bridge automates the processing of public render parameters.
 			</para>
 			<para>
+				A public render parameter can be mapped to an object's accessor (<literal>get</literal>/<literal>set</literal> method) designed to handle a String representation of the value via a <application>Faces</application> <literal>ValueExpression</literal>.
+			</para>
+			<para>
+				When a new public render parameter value is received in a request, the bridge sets the value by calling the <literal>ValueExpression</literal>'s <parameter>setValue()</parameter>.
+			</para>
+			<para>
+				At the end of a request, if the current value of any mapped public render parameter doesn't match the current incoming value, the bridge sets the new value in an outgoing public render parameter (if feasible in the given phase).
+			</para>
+			<para>
 				See <xref linkend="sect-Reference_Guide-Portlet_2.0_Coordination-Public_Render_Parameters" /> for details and examples.
 			</para>
 		</section>
@@ -45,45 +66,51 @@
 	<section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Bridge_Frameworks_and_Extensions">
 		<title>Bridge Frameworks and Extensions</title>
 		<para>
-			The JBoss Portlet Bridge currently supports JBoss Portal, GateIn, JSF 1.2, JBoss Seam, and JBoss Richfaces. There are configurations that apply to supporting each framework. See section <xref linkend="sect-Reference_Guide-Bridge_Configuration" /> for instructions.
+			The JBoss Portlet Bridge currently supports &PRODUCT;, <application>GateIn</application>, <application>JSF 1.2</application>, <application>JBoss Seam</application>, and <application>JBoss Richfaces</application>. There are configurations that apply to supporting each framework. See section <xref linkend="sect-Reference_Guide-Bridge_Configuration" /> for instructions.
 		</para>
 		<para>
-			The JBoss Portlet Bridge project is also actively developing extensions called "Bridgelets". In this current release we decided to bring all of our bridgelets into the impl code base since they are critical in most JSF portlet applications. Now it only takes a single line of configuration to utilize these features.
+			The JBoss Portlet Bridge project is also actively developing extensions called "<emphasis role="bold">Bridgelets</emphasis>".
 		</para>
+		<para>
+			In this release it was decided to bring all available bridgelets into the impl code base since they are critical in most JSF portlet applications. A single line of configuration utilizes these features.
+		</para>
 		<section id="sect-Reference_Guide-Bridge_Frameworks_and_Extensions-Seam_Bridgelets">
 			<title>Seam Bridgelets</title>
 			<para>
-				For example, the PortalIdentity seam component allows you to instantly have SSO between Seam and GateIn or JBoss Portal. This extension is configured in your Seam application's components.xml file as follows.
+				For example, the <literal>PortalIdentity</literal> <application>Seam</application> component allows you to instantly have Single Sign-On (SSO) between <application>Seam</application> and <application>GateIn</application> or <application>&PRODUCT;</application>.
 			</para>
+			<para>
+				This extension is configured in your <application>Seam</application> application's <filename>components.xml</filename> file as follows.
+			</para>
 			
-<programlisting role="XML">
-    &lt;security:portal-identity  authenticate-method="#{authenticator.authenticate}"/&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+<security:portal-identity  authenticate-method="#{authenticator.authenticate}"/>
+]]></programlisting>
 		</section>
 		
 		<section id="sect-Reference_Guide-Bridge_Frameworks_and_Extensions-RichFaces_Bridgelets">
 			<title>RichFaces Bridgelets</title>
 			<para>
-				Richfaces does not account for multiple components on the same portal page by default. This following web.xml renders all RichFaces component javascript to be portal friendly.
+				<application>Richfaces</application> does not account for multiple components on the same portal page by default. This following <filename>web.xml</filename> renders all <application>RichFaces</application> component javascript portal-friendly.
 			</para>
 			
-<programlisting role="XML">
-    &lt;context-param&gt;
-        &lt;param-name&gt;org.jboss.portletbridge.WRAP_SCRIPTS&lt;/param-name&gt;
-        &lt;param-value&gt;true&lt;/param-value&gt;
-    &lt;/context-param&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+    <context-param>
+        <param-name>org.jboss.portletbridge.WRAP_SCRIPTS</param-name>
+        <param-value>true</param-value>
+    </context-param>
+]]></programlisting>
 		</section>
 
 	</section>
 	
 	<section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Before_you_start">
-		<title>Before you start</title>
+		<title>Before You Start</title>
 		<para>
-			The embedded version in the &PRODUCT; is made to be compatible with the JSF implementation, portal and application server that compose the product. You will find the binaries embedded in <literal>jboss-epp-5.0/portletbridge</literal>
+			The embedded version in the &PRODUCT; is made to be compatible with the JSF implementation, portal and application server that compose the product. You will find the binaries embedded in <filename>jboss-epp-5.0/portletbridge</filename>
  		</para>
 		<para>
-			You can run a provided archetype <xref linkend="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes" /> and deploy the generated war in a few easy steps. This will also give you an empty project to play around with or start from scratch.
+			You can run a provided archetype (See <xref linkend="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes" />) and deploy the generated <literal>war</literal> in a few easy steps.
 		</para>
 	</section>
 	
@@ -165,24 +192,42 @@
 	
 	<section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Video_Tutorials">
 		<title>Video Tutorials</title>
+
 		<para>
-			<ulink url="http://www.vimeo.com/3977469">Episode 1: Getting Started With The Bridge</ulink>
+			The following links provide tutorial videos created by the Portlet Bridge developer:
 		</para>
-		<para>
-			<ulink url="http://www.vimeo.com/4521877">Episode 2: Portlet 1.0 Advanced Seam and RichFaces</ulink>
-		</para>
-		<para>
-			<ulink url="http://www.vimeo.com/5847864">Episode 3: Seam and Portlet 2.0 Eventing</ulink>
-		</para>
-		<para>
-			<ulink url="http://www.vimeo.com/7255033">Episode 4: Running the 2.0 bridge on GateIn and deploy using JBoss Tools</ulink>
-		</para>
-		<para>
-			<ulink url="http://www.vimeo.com/7255033">Episode 5: GateIn JMX Metrics and Dashboard Demo</ulink>
-		</para>
-		<para>
-			<ulink url="http://www.vimeo.com/wesleyhales/videos">Check here for the latest videos.</ulink>
-		</para>
+		<itemizedlist>
+			<listitem>
+				<para>
+					<ulink url="http://www.vimeo.com/3977469">Episode 1: Getting Started With The Bridge</ulink>
+				</para>
+			</listitem>
+			<listitem>
+				<para>
+					<ulink url="http://www.vimeo.com/4521877">Episode 2: Portlet 1.0 Advanced Seam and RichFaces</ulink>
+				</para>
+			</listitem>
+			<listitem>
+				<para>
+					<ulink url="http://www.vimeo.com/5847864">Episode 3: Seam and Portlet 2.0 Eventing</ulink>
+				</para>
+			</listitem>
+			<listitem>
+				<para>
+					<ulink url="http://www.vimeo.com/7255033">Episode 4: Running the 2.0 bridge on GateIn and deploy using JBoss Tools</ulink>
+				</para>
+			</listitem>
+			<listitem>
+				<para>
+					<ulink url="http://www.vimeo.com/7255033">Episode 5: GateIn JMX Metrics and Dashboard Demo</ulink>
+				</para>
+			</listitem>
+			<listitem>
+				<para>
+					<ulink url="http://www.vimeo.com/wesleyhales/videos">Check here for the latest videos.</ulink>
+				</para>
+			</listitem>
+		</itemizedlist>
 	</section>
 
 </section>

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/overview.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/overview.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/overview.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,30 +1,58 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-JBoss_Portlet_Bridge_Overview">
 	<title>JBoss Portlet Bridge Overview</title>
-	<para>
-		To get an idea of the JBoss Portlet Bridge community, the developers, and for wiki information, checkout <ulink url="http://www.jboss.org/portletbridge/">the project page</ulink>.
-	</para>
 	<formalpara id="form-Reference_Guide-JBoss_Portlet_Bridge_Overview-What_is_the_JBoss_Portlet_Bridge">
 		<title>What is the JBoss Portlet Bridge?</title>
 		<para>
-			The JBoss Portlet Bridge (or JBPB for short) is a non-final draft implementation of the <ulink url="http://jcp.org/en/jsr/detail?id=329">JSR-329</ulink> specification which supports the JSF 1.2 runtime within a JSR 286 portlet and with added enhancements to support other web frameworks (such as <ulink url="http://www.seamframework.org/">Seam</ulink> and <ulink url="http://www.jboss.org/jbossrichfaces/">RichFaces</ulink>). It allows any Java developer to get started quickly with their JSF web application running in a portal environment. The developer no longer needs to worry about the underlying portlet development, portlet concepts, or the API.
+			The JBoss Portlet Bridge (or <literal>JBPB</literal> for short) is a non-final implementation of the <ulink url="http://jcp.org/en/jsr/detail?id=329">JSR-329</ulink> specification. 
 		</para>
 	</formalpara>
+	<para>
+		It supports the JSF 1.2 runtime within a JSR 286 portlet and with added enhancements to support other web frameworks (such as <ulink url="http://www.seamframework.org/">Seam</ulink> and <ulink url="http://www.jboss.org/jbossrichfaces/">RichFaces</ulink>). 
+	</para>
+
+	<para>
+		It allows any Java developer to quickly get started with their JSF web application running in a portal environment. The developer no longer needs to worry about the underlying portlet development, portlet concepts, or the API.
+	</para>
+
+	<para>
+		Find more information about the JBoss Portlet Bridge, the developers, the community at <ulink url="http://www.jboss.org/portletbridge/">the project page</ulink>.
+	</para>
+
 	<formalpara id="form-Reference_Guide-JBoss_Portlet_Bridge_Overview-Understanding_how_JSF_works_with_Portal">
 		<title>Understanding how JSF works with Portal</title>
 		<para>
-			The portlet bridge isn't a portlet. It's the mediator between the two environments and allows JSF and Portal to be completely unaware of each other. The bridge is used to execute Faces requests on behalf of the portlet. During each request, the Faces environment is setup and handled by the bridge. Part of this implementation acts as a Faces controller much as the FacesServlet does in the direct client request world. The other part of this implementation is provided by implementating a variety of (standard) Faces extensions.
+			The portlet bridge is not a portlet. It is the mediator between the two environments and allows JSF and Portal to be completely unaware of each other. 
 		</para>
 	</formalpara>
-	<note>
 		<para>
-			This draft specification for the JSR 329 specification is not final. Any final specification that may be published will likely contain differences, some of which may be substantial. Publication of this draft specification is not intended to provide the basis for implementations of the specification. This draft specification is provided AS IS, with all faults. THERE ARE NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WARRANTIES OF CONDITION OF TITLE OR NONINFRINGEMENT. You may copy and display this draft specification provided that you include this notice and any existing copyright notice. Except for the limited copyright license granted above, there are no other licenses granted to any intellectual property owned or controlled by any of the authors or developers of this material. No other rights are granted by implication, estoppel or otherwise.
+			The bridge is used to execute <literal>Faces</literal> requests on behalf of the portlet. During each request, the <literal>Faces</literal> environment is setup and handled by the bridge.
 		</para>
-	</note>
+		<para>
+			Part of this implementation acts as a <literal>Faces</literal> controller much as the FacesServlet does in the direct client request environment.
+		</para>
+		<para>
+			The other part of this implementation is provided by implementating a variety of (standard) <literal>Faces</literal> extensions.
+		</para>
+	<important>
+		<title>Disclaimer</title>
+		<para>
+			This draft specification for the JSR 329 specification is not final. Any final specification that may be published will likely contain differences, some of which may be substantial.
+		</para>
+		<para>
+			Publication of this draft specification is not intended to provide the basis for implementations of the specification. This draft specification is provided AS IS.
+		</para>
+		<para>
+			THERE ARE NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WARRANTIES OF CONDITION OF TITLE OR NONINFRINGEMENT. You may copy and display this draft specification provided that you include this notice and any existing copyright notice.
+		</para>
+		<para>
+			Except for the limited copyright license granted above, there are no other licenses granted to any intellectual property owned or controlled by any of the authors or developers of this material. No other rights are granted by implication, estoppel or otherwise.
+		</para>
+	</important>
 	<!--  <figure id="build.fig">
             <title>Faces in Portlet Environment</title>
             <mediaobject>

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge">
@@ -11,123 +11,145 @@
 	<section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Excluding_Attributes_from_the_Bridge_Request_Scope">
 		<title>Excluding Attributes from the Bridge Request Scope</title>
 		<para>
-			When your application uses request attributes on a per request basis and you do not want that particular attribute to be managed in the extended bridge request scope, you must use the following configuration in your faces-config.xml. Below you will see that any attribute namespaced as foo.bar or any attribute beginning with foo.baz(wildcard) will be excluded from the bridge request scope and only be used per that application's request.
+			When your application uses request attributes on a per request basis and you do not want that particular attribute to be managed in the extended bridge request scope, you must use the following configuration in your <filename>faces-config.xml</filename>.
 		</para>
+		<para>
+			In the code sample below you can see that any attribute namespaced as <literal>foo.bar</literal> or any attribute beginning with <literal>foo.baz(wildcard)</literal> will be excluded from the bridge request scope and only be used per that application's request.
+		</para>
 		
-<programlisting role="XML">
-         &lt;application&gt;
-          &lt;application-extension&gt;
-              &lt;bridge:excluded-attributes&gt;
-                  &lt;bridge:excluded-attribute&gt;foo.bar&lt;/bridge:excluded-attribute&gt;
-                  &lt;bridge:excluded-attribute&gt;foo.baz.*&lt;/bridge:excluded-attribute&gt;
-              &lt;/bridge:excluded-attributes&gt;
-          &lt;/application-extension&gt;
-         &lt;/application&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+         <application>
+          <application-extension>
+              <bridge:excluded-attributes>
+                  <bridge:excluded-attribute>foo.bar</bridge:excluded-attribute>
+                  <bridge:excluded-attribute>foo.baz.*</bridge:excluded-attribute>
+              </bridge:excluded-attributes>
+          </application-extension>
+         </application>
+]]></programlisting>
 	</section>
 	
 	<section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Supporting_PortletMode_Changes">
 		<title>Supporting PortletMode Changes</title>
 		<para>
-			A PortletMode represents a distinct render path within an application. There are three standard modes: view, edit, and help. The bridge's ExternalContext.encodeActionURL recognizes the query string parameter javax.portlet.faces.PortletMode and uses this parameter's value to set the portlet mode on the underlying portlet actionURL or response. Once processed it then removes this parameter from the query string. This means the following navigation rule causes one to render the \edit.jspx viewId in the portlet edit mode:
+			A <literal>PortletMode</literal> represents a distinct render path within an application. There are three standard modes: <emphasis>view</emphasis>, <emphasis>edit</emphasis>, and <emphasis>help</emphasis>.
 		</para>
+		<para>
+			The bridge's <literal>ExternalContext.encodeActionURL</literal> recognizes the query string parameter <literal>javax.portlet.faces.PortletMode</literal> and uses this parameter's value to set the portlet mode on the underlying portlet <literal>actionURL</literal> or response.
+		</para>
+		<para>
+			Once processed it then removes this parameter from the query string. This means the following navigation rule causes one to render the \edit.jspx viewId in the portlet edit mode:
+		</para>
 		
-<programlisting role="XML">
-         &lt;navigation-rule&gt;
-            &lt;from-view-id&gt;/register.jspx&lt;/from-view-id&gt;
-            &lt;navigation-case&gt;
-              &lt;from-outcome&gt;edit&lt;/from-outcome&gt;
-              &lt;to-view-id&gt;/edit.jspx?javax.portlet.faces.PortletMode=edit&lt;/to-view-id&gt;
-           &lt;/navigation-case&gt;
-         &lt;/navigation-rule&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+         <navigation-rule>
+            <from-view-id>/register.jspx</from-view-id>
+            <navigation-case>
+              <from-outcome>edit</from-outcome>
+              <to-view-id>/edit.jspx?javax.portlet.faces.PortletMode=edit</to-view-id>
+           </navigation-case>
+         </navigation-rule>
+]]></programlisting>
 	</section>
 	
 	<section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Navigating_to_a_modes_last_viewId">
 		<title>Navigating to a mode's last viewId</title>
 		<para>
-			By default a mode change will start in the mode's default view without any (prior) existing state. One common portlet pattern when returning to the mode one left after entering another mode (e.g.. view -&gt; edit -&gt; view) is to return to the last view (and state) of this origin mode. The bridge will explicitly encode the necessary information so that when returning to a prior mode it can target the appropriate view and restore the appropriate state. The session attributes maintained by the bridge are intended to be used by developers to navigate back from a mode to the last location and state of a prior mode. As such a developer needs to describe a dynamic navigation: "from view X return to the last view of mode y". This is most easily expressed via an EL expression. E.g.
+			By default a mode change will start in the mode's default view without any (prior) existing state. One common portlet pattern when returning to a mode left after entering another mode (e.g.. view -&gt; edit -&gt; view) is to return to the last view (and state) of this origin mode.
 		</para>
+		<para>
+			The bridge will explicitly encode the necessary information so that when returning to a prior mode it can target the appropriate view and restore the appropriate state.
+		</para>
+		<para>
+			The session attributes maintained by the bridge are intended to be used by developers to navigate back from a mode to the last location and state of a prior mode. As such, a developer needs to describe a dynamic navigation: "From view <parameter>X</parameter> return to the last view of mode <parameter>Y</parameter>".
+		</para>
+		<para>
+			This is most easily expressed via an <literal>EL</literal> expression. For example:
+		</para>
 		
-<programlisting role="XML">
-         &lt;navigation-rule&gt;
-           &lt;from-view-id&gt;/edit.jspx*&lt;/from-view-id&gt;
-           &lt;navigation-case&gt;
-             &lt;from-outcome&gt;view&lt;/from-outcome&gt;
-             &lt;to-view-id&gt;#{sessionScope['javax.portlet.faces.viewIdHistory.view']}&lt;/to-view-id&gt;
-           &lt;/navigation-case&gt;
-         &lt;/navigation-rule&gt;
-</programlisting>
-		<note>
+<programlisting language="XML" role="XML"><![CDATA[
+         <navigation-rule>
+           <from-view-id>/edit.jspx*</from-view-id>
+           <navigation-case>
+             <from-outcome>view</from-outcome>
+             <to-view-id>#{sessionScope['javax.portlet.faces.viewIdHistory.view']}</to-view-id>
+           </navigation-case>
+         </navigation-rule>
+]]></programlisting>
+		<section>
 			<title>Note to Portlet Developers</title>
 			<para>
-				Depending on the bridge implementation, when using values from these session scoped attributes or any viewIds which may contain query string parameters it may be necessary to use the wildcard syntax when identifying the rule target. For example, the above
+				Depending on the bridge implementation, when using values from these session scoped attributes or any viewIds which may contain query string parameters it may be necessary to use the wildcard syntax when identifying the rule target. In the above, for example, the
 			</para>
-		</note>
 		
-<programlisting>&lt;to-view-id&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<to-view-id>
+]]></programlisting>
 		<para>
-			expression returns a viewId of the form
+			expression returns a <parameter>viewId</parameter> of the form
 		</para>
 		
-<programlisting>/viewId?javax.portlet.faces.PortletMode=view&amp;....
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[/viewId?javax.portlet.faces.PortletMode=view&....
+]]></programlisting>
 		<para>
-			Without wildcarding, when a subsequent navigation occurs from this new view, the navigation rules wouldn't resolve because there wouldn't be an exact match. Likewise, the above edit.jspx
+			Without wildcarding, when a subsequent navigation occurs from this new view, the navigation rules wouldn't resolve because there wouldn't be an exact match. Likewise, the above <literal>edit.jspx</literal>
 		</para>
 		
-<programlisting>&lt;from-view-id&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<from-view-id>
+]]></programlisting>
 		<para>
 			is wildcarded because there are navigation rules that target it that use a query string:
 		</para>
 		
-<programlisting>&lt;to-view-id&gt; /edit.jspx?javax.portlet.faces.PortletMode=edit &lt;/to-view-id&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+<to-view-id> /edit.jspx?javax.portlet.faces.PortletMode=edit </to-view-id>
+]]></programlisting>
 		<para>
 			Developers are encouraged to use such wildcarding to ensure they execute properly in the broadest set of bridge implementations.
 		</para>
+		</section>
 	</section>
 	
 	<section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Clearing_The_View_History_When_Changing_Portlet_Modes">
 		<title>Clearing The View History When Changing Portlet Modes</title>
 		<para>
-			By default the bridge remembers the view history when you switch to a different portlet mode (like "Help" or "Edit"). You can use the following parameter in your portlet.xml to use the default viewId each time you switch modes.
+			By default the bridge remembers the view history when you switch to a different portlet mode (like "Help" or "Edit"). You can use the following parameter in your <filename>portlet.xml</filename> to use the default viewId each time you switch modes.
 		</para>
 		
-<programlisting role="XML">
-            &lt;init-param&gt;
-               &lt;name&gt;javax.portlet.faces.extension.resetModeViewId&lt;/name&gt;
-               &lt;value&gt;true&lt;/value&gt;
-            &lt;/init-param&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+            <init-param>
+               <name>javax.portlet.faces.extension.resetModeViewId</name>
+               <value>true</value>
+            </init-param>
+]]></programlisting>
 	</section>
 	
 	<section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-General_Error_Handling">
 		<title>General Error Handling</title>
 		<note>
 			<para>
-				If you're developing a Seam portlet you can now use pages.xml for all error handling.
+				If you are developing a <application>Seam</application> portlet you can now use <filename>pages.xml</filename> for all error handling.
 			</para>
 		</note>
 		<para>
-			The following configuration may be used to handle exceptions. This is also useful for handling session timeout and ViewExpiredExceptions.
+			The following configuration may be used to handle exceptions. This is also useful for handling session timeout and <literal>ViewExpiredExceptions</literal>.
 		</para>
-		<para>
-			Pay attention to the location element. It must contain the /faces/ mapping to work properly.
-		</para>
+		<note>
+		<title>The Location Element</title>
+			<para>
+				The location element must contain the <filename>/faces/</filename> mapping to work properly.
+			</para>
+		</note>
 		
-<programlisting role="XML">
-         &lt;error-page&gt;
-            &lt;exception-type&gt;javax.servlet.ServletException&lt;/exception-type&gt;
-            &lt;location&gt;/faces/error.xhtml&lt;/location&gt;
-         &lt;/error-page&gt;
-         &lt;error-page&gt;
-            &lt;exception-type&gt;javax.faces.application.ViewExpiredException&lt;/exception-type&gt;
-            &lt;location&gt;/faces/error.xhtml&lt;/location&gt;
-         &lt;/error-page&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+         <error-page>
+            <exception-type>javax.servlet.ServletException</exception-type>
+            <location>/faces/error.xhtml</location>
+         </error-page>
+         <error-page>
+            <exception-type>javax.faces.application.ViewExpiredException</exception-type>
+            <location>/faces/error.xhtml</location>
+         </error-page>
+]]></programlisting>
 	</section>
 	
 	<section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Custom_Ajax_Error_Handling">
@@ -136,8 +158,8 @@
 			By default, error handling is sent to a standard servlet page for Ajax requests. To handle the error inside the portlet, use the following javascript:
 		</para>
 		
-<programlisting role="XML">
-         &lt;script type="text/javascript"&gt;
+<programlisting language="XML" role="XML"><![CDATA[
+         <script type="text/javascript">
            A4J.AJAX.onError = function(req,status,message){
              window.alert("Custom onError handler "+message);
            }
@@ -149,47 +171,59 @@
                return false;
              }
            }
-         &lt;/script&gt;
-</programlisting>
+         </script>
+]]></programlisting>
 		<para>
-			Also, add the following to web.xml. Read more about these settings here <ulink url="http://docs.jboss.org/richfaces/3.3.3.BETA1/en/devguide/html/ArchitectureOverview.html#RequestErrorsAndSessionExpirationHandling">Request Errors and Session Expiration Handling</ulink>
+			Also, add the following to <filename>web.xml</filename>.
 		</para>
 		
-<programlisting role="XML">
-       &lt;context-param&gt;
-        &lt;param-name&gt;org.ajax4jsf.handleViewExpiredOnClient&lt;/param-name&gt;
-        &lt;param-value&gt;true&lt;/param-value&gt;
-       &lt;/context-param&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[
+       <context-param>
+        <param-name>org.ajax4jsf.handleViewExpiredOnClient</param-name>
+        <param-value>true</param-value>
+       </context-param>
+]]></programlisting>
+		<para>
+			Read more about these settings here <ulink url="http://docs.jboss.org/richfaces/3.3.3.BETA1/en/devguide/html/ArchitectureOverview.html#RequestErrorsAndSessionExpirationHandling">Request Errors and Session Expiration Handling</ulink>
+		</para>
 	</section>
 	
 	<section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Communication_Between_Your_Portlets">
 		<title>Communication Between Your Portlets</title>
 		<para>
-			There are roughly 4 different ways to send messages, events, and parameters between portlets which are contained in different ears/wars or contained in the same war. The Portlet Container does not care if you have 2 portlets in the same war or if they are separated, because each portlet has a different HttpSession.
+			There are four different ways to send messages, events, and parameters between portlets which are contained in different <literal>ears/wars</literal> or contained in the same <literal>war</literal>. 
 		</para>
 		<para>
-			Of course, with the Portlet 2.0 spec, the recommended way to share a parameter or event payload between 2 or more portlets are the <xref linkend="sect-Reference_Guide-Portlet_2.0_Coordination-Public_Render_Parameters" /> and <xref linkend="sect-Reference_Guide-Portlet_2.0_Coordination-Sending_and_Receiving_Events" /> mechanisms. This allows you to decouple your application from surgically managing objects in the PortletSession.APPLICATION_SCOPE.
+			Having two portlets in the same <literal>war</literal> or having them separated does not affect the Portlet Container because each portlet has a different <parameter>HttpSession</parameter>.
 		</para>
 		<para>
-			But, if these do not meet your usecase or you have a different strategy, you can use one of the following methods.
+			The recommended way to share a parameter or event payload between two or more portlets with the Portlet 2.0 specification are the <xref linkend="sect-Reference_Guide-Portlet_2.0_Coordination-Public_Render_Parameters" /> and <xref linkend="sect-Reference_Guide-Portlet_2.0_Coordination-Sending_and_Receiving_Events" /> mechanisms.
 		</para>
+		<para>
+			This allows you to decouple your application from surgically managing objects in the <parameter>PortletSession.APPLICATION_SCOPE.</parameter>
+		</para>
+		<para>
+			However, if these do not meet your use case or you have a different strategy, you can use one of the following methods.
+		</para>
 		<section id="sect-Reference_Guide-Communication_Between_Your_Portlets-Storing_Components_in_PortletSession.APPLICATION_SCOPE">
-			<title>Storing Components in PortletSession.APPLICATION_SCOPE</title>
+			<title>Storing Components in <parameter>PortletSession.APPLICATION_SCOPE</parameter></title>
 			<para>
-				Sometimes it makes sense to store your Seam components in the portlet APPLICATION_SCOPE. By default, these objects are stored in the PORTLET_SCOPE but with the annotation below, you can fish this class out of the PortletSession and use its values in other portlets across different Seam applications.
+				Sometimes it is beneficial to store your <application>Seam</application> components in the portlet <parameter>APPLICATION_SCOPE</parameter>.
 			</para>
+			<para>
+				By default, these objects are stored in the <parameter>PORTLET_SCOPE</parameter> but with the annotation below, this class can be pulled out of the <literal>PortletSession</literal> and its values used in other portlets across different <application>Seam</application> applications.
+			</para>
 			
-<programlisting role="XML">
+<programlisting language="XML" role="XML">
          @PortletScope(PortletScope.ScopeType.APPLICATION_SCOPE)
 </programlisting>
 			<para>
 				Then you would pull the statefull object from the session:
 			</para>
 			
-<programlisting role="java">
-          YourSessionClass yourSessionClass = (YourSessionClass)getRenderRequest().getAttribute("javax.portlet.p./default/seamproject/seamprojectPortletWindow?textHolder");
-</programlisting>
+<programlisting language="Java" role="JAVA"><![CDATA[
+YourSessionClass yourSessionClass = (YourSessionClass)getRenderRequest().getAttribute("javax.portlet.p./default/seamproject/seamprojectPortletWindow?textHolder");
+]]></programlisting>
 			<para>
 				This method is demonstrated in this video: <ulink url="http://www.vimeo.com/4521877">Lesson 2: Portlet 1.0 Advanced Seam and RichFaces</ulink>
 			</para>
@@ -198,10 +232,10 @@
 		<section id="sect-Reference_Guide-Communication_Between_Your_Portlets-Using_the_PortletSession">
 			<title>Using the PortletSession</title>
 			<para>
-				If you need to access the PortletSession to simply share a parameter/value across multiple portlets, you can use the following to do so.
+				If you need to access the <literal>PortletSession</literal> to simply share a parameter or value across multiple portlets, you can use the following:
 			</para>
 			
-<programlisting role="java">
+<programlisting language="Java" role="JAVA"><![CDATA[
       Object objSession = FacesContext.getCurrentInstance().getExternalContext().getSession(false);
       try
       {
@@ -210,22 +244,22 @@
             PortletSession portalSession = (PortletSession)objSession;
             portalSession.setAttribute("your parameter name","parameter value",PortletSession.APPLICATION_SCOPE);
             ...
-</programlisting>
+]]></programlisting>
 			<para>
 				Then, in your JSP or Facelets page, you can use:
 			</para>
 			
-<programlisting role="XML">
+<programlisting language="XML" role="XML"><![CDATA[
          #{httpSessionScope['your parameter name']}
-</programlisting>
+]]></programlisting>
 			<para>
 				<note>
 					<title>Note to Portlet Developers</title>
 					<para>
-						#{httpSessionScope} was implemented after 2.0.0.BETA. If you are using the 1.0 bridge or pre 2.0.0.BETA, you must use the el variable #{sessionApplicationScope}
+						<literal>#{httpSessionScope}</literal> was implemented after <literal>2.0.0.BETA</literal>. If you are using the <literal>1.0</literal> bridge or pre <literal>2.0.0.BETA</literal>, you must use the <literal>EL</literal> variable <literal>#{sessionApplicationScope}</literal>.
 					</para>
 				</note>
-				 For more information about which EL variables are provided by the bridge, read <ulink url="http://jcp.org/aboutJava/communityprocess/edr/jsr329/index2.html">section 6.5.1 of the JSR-329 specification</ulink>.
+				 For more information about which <literal>EL</literal> variables are provided by the bridge, read <ulink url="http://jcp.org/aboutJava/communityprocess/edr/jsr329/index2.html">section 6.5.1 of the JSR-329 specification</ulink>.
 			</para>
 		</section>
 
@@ -234,65 +268,63 @@
 	<section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Linking_to_PortletJSF_Pages_Using_houtputink">
 		<title>Linking to Portlet/JSF Pages Using h:outputink</title>
 		<para>
-			For linking to any JSF/Facelets page within your portlet web application, you may use the following.
+			For linking to any JSF/Facelets page within your portlet web application, you can use the following.
 		</para>
 		
-<programlisting role="java">
-      &lt;h:outputLink value="#{facesContext.externalContext.requestContextPath}/home.xhtml"&gt;
-        &lt;f:param name="javax.portlet.faces.ViewLink" value="true"/&gt;
+<programlisting language="Java" role="JAVA"><![CDATA[
+      <h:outputLink value="#{facesContext.externalContext.requestContextPath}/home.xhtml">
+        <f:param name="javax.portlet.faces.ViewLink" value="true"/>
         navigate to the test page
-      &lt;/h:outputLink&gt;
-</programlisting>
+      </h:outputLink>
+]]></programlisting>
 	</section>
 	
 	<section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Redirecting_to_an_External_Page_or_Resource">
 		<title>Redirecting to an External Page or Resource</title>
 		<para>
-			To link to a non JSF view (i.e. jboss.org) you can use the following parameter.
+			To link to a non JSF view (that is, jboss.org) you can use the following parameter.
 		</para>
 		
-<programlisting role="java">
-      &lt;h:commandLink actionListener="#{yourBean.yourListenr}"&gt;
-        &lt;f:param name="javax.portlet.faces.DirectLink" value="true"/&gt;
+<programlisting language="Java" role="JAVA"><![CDATA[
+      <h:commandLink actionListener="#{yourBean.yourListenr}">
+        <f:param name="javax.portlet.faces.DirectLink" value="true"/>
         navigate to the test page
-      &lt;/h:commandLink&gt;
-</programlisting>
+      </h:commandLink>
+]]></programlisting>
 		<para>
-			Then in your backing bean, you must call a redirect().
+			Then in your backing bean, you must call a <parameter>redirect()</parameter>.
 		</para>
 		
-<programlisting role="java">
+<programlisting language="Java" role="JAVA"><![CDATA[
       FacesContext.getCurrentInstance().getExternalContext().redirect("http://www.jboss.org");
-</programlisting>
+]]></programlisting>
 	</section>
 	
 	<section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Using_Provided_EL_Variables">
 		<title>Using Provided EL Variables</title>
 		<para>
-			All EL variables found in the JSR-329 (Portlet 2.0) specification are available in the JBoss Portlet Bridge. For example, you can use the following to edit the portlet preferences on the UI.
+			All <literal>EL</literal> variables found in the JSR-329 (Portlet 2.0) specification are available in the JBoss Portlet Bridge. For example, you can use the following to edit the portlet preferences on the UI:
 		</para>
 		
-<programlisting role="xml">
-      &lt;h:form&gt;
-           &lt;h:inputText id="pref" required="true" value="#{mutablePortletPreferencesValues['userName'].value}" /&gt;
-           &lt;h:commandButton actionListener="#{myBean.savePref}" value="Save Preferences" /&gt;
-        &lt;/h:form&gt;
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[      <h:form>
+           <h:inputText id="pref" required="true" value="#{mutablePortletPreferencesValues['userName'].value}" />
+           <h:commandButton actionListener="#{myBean.savePref}" value="Save Preferences" />
+        </h:form>
+]]></programlisting>
 		<para>
 			Then in your backing bean, you must call the PortletPreferences.store() method.
 		</para>
 		
-<programlisting role="java">
-      Object request = FacesContext.getCurrentInstance().getExternalContext().getRequest();
+<programlisting language="Java" role="JAVA"><![CDATA[      Object request = FacesContext.getCurrentInstance().getExternalContext().getRequest();
       PortletRequest portletRequest = (PortletRequest)request;
       if (request instanceof PortletRequest) {
          try {
             PortletPreferences portletPreferences = portletRequest.getPreferences();
             portletPreferences.store();
-</programlisting>
+]]></programlisting>
 	</section>
 	
-	<!-- EL variables --><!-- using sendRedirect --><!-- FacesContext.getCurrentInstance().getExternalContext().redirect("http://www.google.com"); --><!-- and adding the <f:param name="javax.portlet.faces.DirectLink" value="true"/> to the commandButton, all seems fine.  --><!--   <section>
+	<!-- DO NOT UNCOMMENT!! EL variables --><!-- using sendRedirect --><!-- FacesContext.getCurrentInstance().getExternalContext().redirect("http://www.google.com"); --><!-- and adding the <f:param name="javax.portlet.faces.DirectLink" value="true"/> to the commandButton, all seems fine.  --><!--   <section>
       <title>Integrations with JBoss Tools IDE</title>
       <para>
 
@@ -303,5 +335,3 @@
 
    </section>  -->
 </section>
-
-

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Building_JSF_Portlets">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Portlet_Primer">
@@ -25,18 +25,19 @@
 		<section id="sect-Reference_Guide-JSR_168_and_JSR_286_overview-Portal_Pages">
 			<title>Portal Pages</title>
 			<para>
-				A portal can be considered as a series of web pages with different <emphasis>areas</emphasis> within them. Those areas contain different <emphasis>windows</emphasis> and each <emphasis>window</emphasis> contains portlet:
+				A portal can be considered as a series of web pages with different <emphasis>areas</emphasis> within them. Those areas contain different <emphasis>windows</emphasis> and each <emphasis>window</emphasis> contains a <emphasis>portlet</emphasis>:
 			</para>
 			<para>
 				The diagram below visually represents this nesting:
 			</para>
-			<para>
-				<mediaobject>
-					<imageobject>
-						<imagedata fileref="images/PortletDevelopment/Standard/SpecPortalDef.png" format="PNG" scalefit="1" width="444" />
-					</imageobject>
-				</mediaobject>
-			</para>
+			<mediaobject>
+				<imageobject role="html">
+					<imagedata fileref="images/PortletDevelopment/Standard/SpecPortalDef.png" format="PNG" align="center" scale="100" />
+				</imageobject>
+				<imageobject role="fo">
+					<imagedata fileref="images/PortletDevelopment/Standard/SpecPortalDef.png" format="PNG" align="center" contentwidth="140mm" />
+				</imageobject>
+			</mediaobject>
 		</section>
 		
 		<section id="sect-Reference_Guide-JSR_168_and_JSR_286_overview-Rendering_Modes">
@@ -139,7 +140,7 @@
 					</step>
 					<step>
 						<para>
-							If the compile is successfully packaged the result will be available in: <filename>SimplestHelloWorld/target/SimplestHelloWorld-0.0.1.war </filename>.
+							If the compile is successfully packaged, the result will be available in: <filename>SimplestHelloWorld/target/SimplestHelloWorld-0.0.1.war </filename>.
 						</para>
 					</step>
 					<step>
@@ -156,11 +157,14 @@
 						<para>
 							Create a new portal page and add the portlet to it.
 						</para>
+<!-- This image needs to be updated to RH skinned version of Portal. Unable to do this. SM -->
 						<mediaobject>
-							<imageobject>
-								<objectinfo id="obje-Reference_Guide-Compiling-SimplestHelloWorldPortlet_deployed_on_a_new_page"><title>SimplestHelloWorldPortlet deployed on a new page</title>
-								</objectinfo><imagedata fileref="images/PortletDevelopment/Standard/first_portlet/deployed.png" format="PNG" width="444" />
+							<imageobject role="html">
+								<imagedata fileref="images/PortletDevelopment/Standard/first_portlet/deployed.png" format="PNG" align="center" scale="100" />
 							</imageobject>
+							<imageobject role="fo">
+								<imagedata fileref="images/PortletDevelopment/Standard/first_portlet/deployed.png" format="PNG" align="center" contentwidth="120mm" />
+							</imageobject>
 						</mediaobject>
 					</step>
 				</procedure>
@@ -170,7 +174,7 @@
 			<section id="sect-Reference_Guide-Deploying_your_first_Portlet-Package_Structure">
 				<title>Package Structure</title>
 				<para>
-					Like other Java EE applications, &PRODUCT; portlets are packaged in WAR files. A typical portlet WAR file can include servlets, resource bundles, images, HTML, JavaServer Pages (JSP), and other static or dynamic files.
+					Like other Java EE applications, &PRODUCT; portlets are packaged in <literal>WAR</literal> files. A typical portlet <literal>WAR</literal> file can include servlets, resource bundles, images, HTML, JavaServer Pages (JSP), and other static or dynamic files.
 				</para>
 				<para>
 					The following is an example of the directory structure of the <filename>SimplestHelloWorld</filename> portlet:
@@ -202,7 +206,7 @@
 						</callout>
 						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Package_Structure.portlet">
 							<para>
-								This is the mandatory descriptor files for portlets. It is used during deployment..
+								This is the mandatory descriptor file for portlets. It is used during deployment.
 							</para>
 						</callout>
 						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Package_Structure.web">
@@ -229,7 +233,7 @@
 						<area coords="17" id="area-Reference_Guide-Deploying_your_first_Portlet-Portlet_Class.close" />
 					</areaspec>
 					
-<programlisting role="JAVA">package org.gatein.portal.examples.portlets;
+<programlisting language="Java" role="JAVA"><![CDATA[package org.gatein.portal.examples.portlets;
  
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -247,8 +251,7 @@
       writer.write("Hello World !");
       writer.close();
    }
-}
-</programlisting>
+}]]></programlisting>
 					<calloutlist>
 						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Portlet_Class.extends">
 							<para>
@@ -297,7 +300,7 @@
 			<section id="sect-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors">
 				<title>Application Descriptors</title>
 				<para>
-					&PRODUCT; requires certain descriptors to be included in a portlet WAR file. These descriptors are defined by the Jave EE (<filename>web.xml</filename>) and Portlet Specification (<filename>portlet.xml</filename>).
+					&PRODUCT; requires certain descriptors to be included in a portlet <literal>WAR</literal> file. These descriptors are defined by the Jave EE (<filename>web.xml</filename>) and Portlet Specification (<filename>portlet.xml</filename>).
 				</para>
 				<para>
 					Below is an example of the <filename>SimplestHelloWorldPortlet/WEB-INF/portlet.xml</filename> file. This file must adhere to its definition in the JSR-286 Portlet Specification. More than one portlet application may be defined in this file:
@@ -310,26 +313,24 @@
 						<area coords="15" id="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.portletinfo" />
 					</areaspec>
 					
-<programlisting>
-&lt;portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+<programlisting language="XML" role="XML"><![CDATA[<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd 
                                          http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
-   version="2.0"&gt;
-   &lt;portlet&gt;
-      &lt;portlet-name&gt;SimplestHelloWorldPortlet&lt;/portlet-name&gt;
-      &lt;portlet-class&gt;
+   version="2.0">
+   <portlet>
+      <portlet-name>SimplestHelloWorldPortlet</portlet-name>
+      <portlet-class>
          org.gatein.portal.examples.portlets.SimplestHelloWorldPortlet
-      &lt;/portlet-class&gt;
-      &lt;supports&gt;
-        &lt;mime-type&gt;text/html&lt;/mime-type&gt;
-      &lt;/supports&gt;
-      &lt;portlet-info&gt;
-          &lt;title&gt;Simplest Hello World Portlet&lt;/title&gt;
-      &lt;/portlet-info&gt;
-   &lt;/portlet&gt;
-&lt;/portlet-app&gt;
-</programlisting>
+      </portlet-class>
+      <supports>
+        <mime-type>text/html</mime-type>
+      </supports>
+      <portlet-info>
+          <title>Simplest Hello World Portlet</title>
+      </portlet-info>
+   </portlet>
+</portlet-app>]]></programlisting>
 					<calloutlist>
 						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.portletname">
 							<para>
@@ -343,7 +344,7 @@
 						</callout>
 						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.supports">
 							<para>
-								The <literal>&lt;supports&gt; </literal> element declares all of the markup types that a portlet supports in the <literal>render</literal> method. This is accomplished via the <literal>&lt;mime-type&gt; </literal> element, which is required for every portlet.
+								The <literal>&lt;supports&gt;</literal> element declares all of the markup types that a portlet supports in the <literal>render</literal> method. This is accomplished via the <literal>&lt;mime-type&gt;</literal> element, which is required for every portlet.
 							</para>
 							<para>
 								The declared MIME types must match the capability of the portlet. It allows administrators to pair which modes and window states are supported for each markup type.
@@ -352,7 +353,7 @@
 								This does not have to be declared as all portlets must support the <literal>view</literal> portlet mode.
 							</para>
 							<para>
-								Use the <literal>&lt;mime-type&gt; </literal> element to define which markup type the portlet supports. In the example above this is <literal>text/html</literal>. This section tells the portal to only output HTML.
+								Use the <literal>&lt;mime-type&gt;</literal> element to define which markup type the portlet supports. In the example above this is <literal>text/html</literal>. This section tells the portal to only output <literal>HTML</literal>.
 							</para>
 						</callout>
 						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.portletinfo">
@@ -372,7 +373,7 @@
 			<para>
 				This section discusses:
 			</para>
-			<orderedlist>
+			<orderedlist numeration="arabic">
 				<listitem>
 					<para>
 						Adding more features to the previous example.
@@ -394,15 +395,25 @@
 					</para>
 				</listitem>
 			</orderedlist>
+
+			<formalpara>
+			<title>Compiling the example</title>
+					<para>
+						The example used in this section can be found in the <filename>JSPHelloUser</filename> directory.
+					</para>
+			</formalpara>
+			<para>
+				Compile the example as so:
+			</para>
 			<procedure>
 				<step>
 					<para>
-						The example used in this section can be found in the <literal>JSPHelloUser</literal> directory.
+						Execute:
+<programlisting><command>mvn package</command>
+</programlisting>
 					</para>
-				</step>
-				<step>
 					<para>
-						Execute <command>mvn package</command> in this directory.
+						in the <filename>JSPHelloUser</filename> directory.
 					</para>
 				</step>
 				<step>
@@ -416,24 +427,27 @@
 					</para>
 				</step>
 			</procedure>
-			
+<!-- This Image needs to be updated with RH Portal skin. Unable to action this. SM -->
 			<mediaobject>
-				<imageobject>
-					<imagedata align="center" fileref="images/PortletDevelopment/Standard/jsp_portlet/output.png" format="PNG" scalefit="1" width="444" />
+				<imageobject role="html">
+					<imagedata fileref="images/PortletDevelopment/Standard/jsp_portlet/output.png" format="PNG" align="center" scale="100" />
 				</imageobject>
+				<imageobject role="fo">
+					<imagedata fileref="images/PortletDevelopment/Standard/jsp_portlet/output.png" format="PNG" align="center" contentwidth="120mm" />
+				</imageobject>
 			</mediaobject>
 			<note>
 				<para>
-					The <literal>EDIT</literal> button only appears with logged-in users, which is not the case in the screenshot.
+					The <literal>EDIT</literal> button only appears for logged-in users.
 				</para>
 			</note>
 			<section id="sect-Reference_Guide-JavaServer_Pages_Portlet_Example-Package_Structure">
 				<title>Package Structure</title>
 				<para>
-					The package structure in this tutorial does not differ greatly from the previous example, with the exception of adding some JSP files detailed later.
+					The package structure in this tutorial does not differ greatly from the previous example, with the exception of adding some JSP files which are detailed later.
 				</para>
 				<para>
-					The JSPHelloUser portlet contains the mandatory portlet application descriptors. The following is an example of the directory structure of the JSPHelloUser portlet:
+					The <literal>JSPHelloUser</literal> portlet contains the mandatory portlet application descriptors. The following is an example of the directory structure of the <literal>JSPHelloUser</literal> portlet:
 				</para>
 				
 <programlisting>JSPHelloUser-0.0.1.war
@@ -470,7 +484,7 @@
 						<area coords="26" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.include" />
 					</areaspec>
 					
-<programlisting role="JAVA">package org.gatein.portal.examples.portlets;
+<programlisting language="Java" role="JAVA"><![CDATA[package org.gatein.portal.examples.portlets;
  
 import java.io.IOException;
  
@@ -503,8 +517,7 @@
          prd.include(request, response);
       }
    }
-...
-</programlisting>
+...]]></programlisting>
 					<calloutlist>
 						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.doView">
 							<para>
@@ -539,7 +552,7 @@
 					The generic portlet that is inherited dispatches the different views to the methods: <literal>doView</literal> , <literal>doHelp</literal> and <literal>doEdit</literal>.
 				</para>
 				
-<programlisting role="JAVA">...
+<programlisting language="Java" role="JAVA"><![CDATA[...
    protected void doHelp(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException,
          UnavailableException
    {
@@ -555,13 +568,12 @@
       PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher("/jsp/edit.jsp");
       prd.include(rRequest, rResponse);
    }
-...
-</programlisting>
+...]]></programlisting>
 				<para>
 					Portlet calls happen in one or two phases. One when the portlet is rendered and two when the portlet is actioned <emphasis>then</emphasis> rendered.
 				</para>
 				<para>
-					An action phase is a phase where some state changes. The render phase will have access to render parameters that will be passed each time the portlet is refreshed (with the exception of caching capabilities).
+					An action phase is a phase where a state changes. The render phase will have access to render parameters that will be passed each time the portlet is refreshed (with the exception of caching capabilities).
 				</para>
 				<para>
 					The code to be executed during an action has to be implemented in the <emphasis>processAction</emphasis> method of the portlet.
@@ -573,15 +585,15 @@
 						<area coords="6" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.setRenderParameter" />
 					</areaspec>
 					
-<programlisting role="JAVA">...
+<programlisting language="Java" role="JAVA"><![CDATA[...
          public void processAction(ActionRequest aRequest, ActionResponse aResponse) throws PortletException, IOException,
          UnavailableException
    {
       String sYourname = (String) aRequest.getParameter("yourname");
       aResponse.setRenderParameter("yourname", sYourname);
    }
-...
-</programlisting>
+...]]></programlisting>
+
 					<calloutlist>
 						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.processAction">
 							<para>
@@ -590,7 +602,7 @@
 						</callout>
 						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.getActionParameter">
 							<para>
-								Here the parameter is retrieved through an <emphasis>action URL</emphasis> .
+								Here the parameter is retrieved through an <emphasis>action URL</emphasis>.
 							</para>
 						</callout>
 						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.setRenderParameter">
@@ -609,12 +621,12 @@
 					The <filename>help.jsp</filename> and <filename>edit.jsp</filename> files are very simple. Note that CSS styles are used as defined in the portlet specification. This ensures that the portlet will render well within the theme and across portal vendors.
 				</para>
 				
-<programlisting role="XHTML">&lt;div class="portlet-section-header"&gt;Help mode&lt;/div&gt;
-&lt;div class="portlet-section-body"&gt;This is the help mode, a convenient place to give the user some help information.&lt;/div&gt;
+<programlisting language="HTML" role="HTML"><![CDATA[<div class="portlet-section-header">Help mode</div>
+<div class="portlet-section-body">This is the help mode, a convenient place to give the user some help information.</div>]]>
 </programlisting>
 				
-<programlisting role="XHTML">&lt;div class="portlet-section-header"&gt;Edit mode&lt;/div&gt;
-&lt;div class="portlet-section-body"&gt;This is the edit mode, a convenient place to let the user change his portlet preferences.&lt;/div&gt;
+<programlisting language="HTML" role="HTML"><![CDATA[<div class="portlet-section-header">Edit mode</div>
+<div class="portlet-section-body">This is the edit mode, a convenient place to let the user change his portlet preferences.</div>]]>
 </programlisting>
 				<para>
 					The landing page contains the links and form to call our portlet:
@@ -629,47 +641,47 @@
 						<area coords="31" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.method3.2" />
 					</areaspec>
 					
-<programlisting>&lt;%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %&gt;
+<programlisting language="XML" role="XML"><![CDATA[<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
  
-&lt;div class="portlet-section-header"&gt;Welcome !&lt;/div&gt;
+<div class="portlet-section-header">Welcome !</div>
  
-&lt;br/&gt;
+<br/>
  
-&lt;div class="portlet-font"&gt;Welcome on the JSP Hello User portlet,
-my name is GateIn Portal. What's yours ?&lt;/div&gt;
+<div class="portlet-font">Welcome on the JSP Hello User portlet,
+my name is GateIn Portal. What's yours ?</div>
  
-&lt;br/&gt;
+<br/>
  
-&lt;div class="portlet-font"&gt;Method 1: We simply pass the parameter to the render phase:&lt;br/&gt;
-&lt;a href="&lt;portlet:renderURL&gt;&lt;portlet:param name="yourname" value="John Doe"/&gt;
-                &lt;/portlet:renderURL&gt;"&gt;John Doe&lt;/a&gt;&lt;/div&gt;
+<div class="portlet-font">Method 1: We simply pass the parameter to the render phase:<br/>
+<a href="<portlet:renderURL><portlet:param name="yourname" value="John Doe"/>
+                </portlet:renderURL>">John Doe</a></div>
  
-&lt;br/&gt;
+<br/>
  
-&lt;div class="portlet-font"&gt;Method 2: We pass the parameter to the render phase, using valid XML:
+<div class="portlet-font">Method 2: We pass the parameter to the render phase, using valid XML:
 Please check the source code to see the difference with Method 1.
-&lt;portlet:renderURL var="myRenderURL"&gt;
-    &lt;portlet:param name="yourname" value='John Doe'/&gt;
-&lt;/portlet:renderURL&gt;
-&lt;br/&gt;
-&lt;a href="&lt;%= myRenderURL %&gt;"&gt;John Doe&lt;/a&gt;&lt;/div&gt;
+<portlet:renderURL var="myRenderURL">
+    <portlet:param name="yourname" value='John Doe'/>
+</portlet:renderURL>
+<br/>
+<a href="<%= myRenderURL %>">John Doe</a></div>
  
-&lt;br/&gt;
+<br/>
  
-&lt;div class="portlet-font"&gt;Method 3: We use a form:&lt;br/&gt;
+<div class="portlet-font">Method 3: We use a form:<br/>
  
-&lt;portlet:actionURL var="myActionURL"/&gt;
-&lt;form action="&lt;%= myActionURL %&gt;" method="POST"&gt;
-         &lt;span class="portlet-form-field-label"&gt;Name:&lt;/span&gt;
-         &lt;input class="portlet-form-input-field" type="text" name="yourname"/&gt;
-         &lt;input class="portlet-form-button" type="Submit"/&gt;
-&lt;/form&gt;
-&lt;/div&gt;
-</programlisting>
+<portlet:actionURL var="myActionURL"/>
+<form action="<%= myActionURL %>" method="POST">
+         <span class="portlet-form-field-label">Name:</span>
+         <input class="portlet-form-input-field" type="text" name="yourname"/>
+         <input class="portlet-form-button" type="Submit"/>
+</form>
+</div>]]></programlisting>
+
 					<calloutlist>
 						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.taglib">
 							<para>
-								The portlet taglib, needs to be declared.
+								The portlet taglib. This needs to be declared.
 							</para>
 						</callout>
 						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.method1">
@@ -722,20 +734,20 @@
 					As in any JSF application, the file <literal>faces-config.xml</literal> is required. It must contain the following information:
 				</para>
 				
-<programlisting role="XML">&lt;faces-config&gt;
+<programlisting language="XML" role="XML"><![CDATA[<faces-config>
 ...
-    &lt;application&gt;
-      &lt;view-handler&gt;org.jboss.portletbridge.application.PortletViewHandler&lt;/view-handler&gt;
-      &lt;state-manager&gt;org.jboss.portletbridge.application.PortletStateManager&lt;/state-manager&gt;
-   &lt;/application&gt;
+    <application>
+      <view-handler>org.jboss.portletbridge.application.PortletViewHandler</view-handler>
+      <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager>
+   </application>
 ...
-&lt;/faces-config&gt;
+</faces-config>]]>
 </programlisting>
 				<para>
 					The portlet bridge libraries must be available and are usually bundled with the <literal>WEB-INF/lib</literal> directory of the web archive.
 				</para>
 				<para>
-					The other difference compare to a regular portlet application, can be found in the portlet descriptor. All details about it can be found in the JSR-301 specification that the JBoss Portlet Bridge implements.
+					The other difference when compared to a regular portlet application are in the portlet descriptor. All the relevant details about this can be found in the JSR-301 specification that the JBoss Portlet Bridge implements.
 				</para>
 				<programlistingco>
 					<areaspec>
@@ -745,43 +757,43 @@
 						<area coords="31" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.help" />
 					</areaspec>
 					
-<programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+<programlisting language="XML" role="XML"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd 
                                          http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
-   version="2.0"&gt;
-   &lt;portlet&gt;
-      &lt;portlet-name&gt;JSFHelloUserPortlet&lt;/portlet-name&gt;
-      &lt;portlet-class&gt;javax.portlet.faces.GenericFacesPortlet&lt;/portlet-class&gt;
-      &lt;supports&gt;
-         &lt;mime-type&gt;text/html&lt;/mime-type&gt;
-         &lt;portlet-mode&gt;view&lt;/portlet-mode&gt;
-         &lt;portlet-mode&gt;edit&lt;/portlet-mode&gt;
-         &lt;portlet-mode&gt;help&lt;/portlet-mode&gt;
-      &lt;/supports&gt;
-      &lt;portlet-info&gt;
-         &lt;title&gt;JSF Hello User Portlet&lt;/title&gt;
-      &lt;/portlet-info&gt;
+   version="2.0">
+   <portlet>
+      <portlet-name>JSFHelloUserPortlet</portlet-name>
+      <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>view</portlet-mode>
+         <portlet-mode>edit</portlet-mode>
+         <portlet-mode>help</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>JSF Hello User Portlet</title>
+      </portlet-info>
       
-      &lt;init-param&gt;
-         &lt;name&gt;javax.portlet.faces.defaultViewId.view&lt;/name&gt;
-         &lt;value&gt;/jsf/welcome.jsp&lt;/value&gt;
-      &lt;/init-param&gt;
+      <init-param>
+         <name>javax.portlet.faces.defaultViewId.view</name>
+         <value>/jsf/welcome.jsp</value>
+      </init-param>
  
-      &lt;init-param&gt;
-         &lt;name&gt;javax.portlet.faces.defaultViewId.edit&lt;/name&gt;
-         &lt;value&gt;/jsf/edit.jsp&lt;/value&gt;
-      &lt;/init-param&gt;
+      <init-param>
+         <name>javax.portlet.faces.defaultViewId.edit</name>
+         <value>/jsf/edit.jsp</value>
+      </init-param>
  
-      &lt;init-param&gt;
-         &lt;name&gt;javax.portlet.faces.defaultViewId.help&lt;/name&gt;
-         &lt;value&gt;/jsf/help.jsp&lt;/value&gt;
-      &lt;/init-param&gt;
+      <init-param>
+         <name>javax.portlet.faces.defaultViewId.help</name>
+         <value>/jsf/help.jsp</value>
+      </init-param>
  
-   &lt;/portlet&gt;
-&lt;/portlet-app&gt;
-</programlisting>
+   </portlet>
+</portlet-app>]]></programlisting>
+
 					<calloutlist>
 						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.portlet">
 							<para>

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <part id="part-Reference_Guide-Portlet_development">

Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/WSRP.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/WSRP.xml	2010-05-10 16:57:51 UTC (rev 3031)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/WSRP.xml	2010-05-10 22:39:07 UTC (rev 3032)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Web_Services_for_Remote_Portlets_WSRP">



More information about the gatein-commits mailing list