[gatein-commits] gatein SVN: r1674 - in portal/trunk/docs/reference-guide/en/modules: configuration and 3 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Sun Feb 14 20:20:37 EST 2010


Author: smumford
Date: 2010-02-14 20:20:35 -0500 (Sun, 14 Feb 2010)
New Revision: 1674

Modified:
   portal/trunk/docs/reference-guide/en/modules/Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/Development.xml
   portal/trunk/docs/reference-guide/en/modules/Gadgets.xml
   portal/trunk/docs/reference-guide/en/modules/Integration.xml
   portal/trunk/docs/reference-guide/en/modules/Introduction.xml
   portal/trunk/docs/reference-guide/en/modules/Portlets.xml
   portal/trunk/docs/reference-guide/en/modules/SSO.xml
   portal/trunk/docs/reference-guide/en/modules/configuration/Authentication_Token_Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/configuration/Dashboard_Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/configuration/Data_Injector_Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/configuration/Database_Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/configuration/Default_Portal_Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/configuration/IDM_Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/configuration/JavaScript_Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/configuration/Portal_Default_Permission_Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/configuration/Portal_Navigation_Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/configuration/Predefined_User_Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/development/Accessing_User_Profile.xml
   portal/trunk/docs/reference-guide/en/modules/development/Ajax_Loading_Mask_Layer_Deactivation.xml
   portal/trunk/docs/reference-guide/en/modules/development/Dynamic_Layouts.xml
   portal/trunk/docs/reference-guide/en/modules/development/Internationalization_Configuration.xml
   portal/trunk/docs/reference-guide/en/modules/development/JavaScript_Inter_Application_Communication.xml
   portal/trunk/docs/reference-guide/en/modules/development/Portal_Lifecycle.xml
   portal/trunk/docs/reference-guide/en/modules/development/Right_To_Left_Framework.xml
   portal/trunk/docs/reference-guide/en/modules/development/Upload_Component.xml
   portal/trunk/docs/reference-guide/en/modules/development/XML_Resource_Bundles.xml
   portal/trunk/docs/reference-guide/en/modules/gadgets/Gadgets.xml
   portal/trunk/docs/reference-guide/en/modules/gadgets/Setup_a_Gadget_Server.xml
   portal/trunk/docs/reference-guide/en/modules/portlets/AJAX_in_GateIn_Framework.xml
   portal/trunk/docs/reference-guide/en/modules/portlets/Create_a_WebUI_Portlet.xml
   portal/trunk/docs/reference-guide/en/modules/portlets/Groovy_Templates.xml
   portal/trunk/docs/reference-guide/en/modules/portlets/Portlet_Lifecycle.xml
   portal/trunk/docs/reference-guide/en/modules/portlets/Standard.xml
   portal/trunk/docs/reference-guide/en/modules/portlets/WebUI.xml
Log:
commit clean sect ids

Modified: portal/trunk/docs/reference-guide/en/modules/Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Configuration">
 	<title>Configuration</title>
@@ -10,11 +8,9 @@
 	<xi:include href="configuration/Portal_Navigation_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="configuration/Predefined_User_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="configuration/Portal_Default_Permission_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<!--      Kernel/Service_Configuration_for_Beginners       --><!--      Kernel/Service_Configuration_in_Detail      -->
-	<xi:include href="configuration/Database_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<!--       Kernel/Service_Configuration_for_Beginners        --><!--       Kernel/Service_Configuration_in_Detail       --><xi:include href="configuration/Database_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="configuration/Data_Injector_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<!--       Core/LDAP_Configuration      -->
-	<xi:include href="configuration/Skin_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+	<!--        Core/LDAP_Configuration       --><xi:include href="configuration/Skin_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="configuration/JavaScript_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="configuration/Dashboard_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="configuration/Authentication_Token_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

Modified: portal/trunk/docs/reference-guide/en/modules/Development.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/Development.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/Development.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Development">
 	<title>Development</title>

Modified: portal/trunk/docs/reference-guide/en/modules/Gadgets.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/Gadgets.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/Gadgets.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,10 +1,8 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Gadget_development">
-	<!--  
+	<!--   
 
     Copyright (C) 2009 eXo Platform SAS.
     
@@ -23,7 +21,7 @@
     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
     02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-  --><title>Gadget development</title>
+   --><title>Gadget development</title>
 	<xi:include href="gadgets/Gadgets.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="gadgets/Setup_a_Gadget_Server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </chapter>

Modified: portal/trunk/docs/reference-guide/en/modules/Integration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/Integration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/Integration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,10 +1,8 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Integration">
-	<!--    
+	<!--     
 
     Copyright (C) 2009 eXo Platform SAS.
     
@@ -23,16 +21,16 @@
     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
     02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-    --><title>Integration</title>
+     --><title>Integration</title>
 	<para>
 		Stuff Goes Here?
 	</para>
-	<!--     
+	<!--      
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="integration/Use_an_Existing_Portlet_Application.xml" />
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="integration/Package_Gadgets.xml" />
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="integration/JSF1_2_JBossPortletBridge_Richfaces.xml" />
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="integration/JSF1_1_MyFaces_Spring.xml" />
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="integration/Changing_GateIn_URL.xml" />
-     -->
+      -->
 </chapter>
 

Modified: portal/trunk/docs/reference-guide/en/modules/Introduction.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/Introduction.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/Introduction.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,10 +1,8 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Introduction">
-	<!--             
+	<!--              
 
     Copyright (C) 2009 eXo Platform SAS.
     
@@ -23,7 +21,7 @@
     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
     02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-             --><title>Introduction</title>
+              --><title>Introduction</title>
 	<mediaobject>
 		<imageobject>
 			<imagedata fileref="images/Frontpage.png" format="PNG" scalefit="1" width="444" />
@@ -45,7 +43,7 @@
 					Further documentation about the Red Hat &PRODUCT; and other Red Hat products can be found at <ulink type="http" url="www.redhat.com/docs" />
 				</para>
 			</listitem>
-			<!-- 		<listitem>
+			<!--  		<listitem>
 				<para>
 					GateIn videos: <ulink url="http://www.jboss.org/gatein/videos.html">www.jboss.org/gatein/videos.html</ulink>
 				</para>
@@ -59,7 +57,7 @@
 				<para>
 					GateIn downloads: <ulink url="http://www.jboss.org/gatein/downloads.html">www.jboss.org/gatein/downloads.html</ulink>
 				</para>
-			</listitem>  -->
+			</listitem>   -->
 		</itemizedlist>
 	</section>
 

Modified: portal/trunk/docs/reference-guide/en/modules/Portlets.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/Portlets.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/Portlets.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <chapter id="chap-Reference_Guide-Portlet_development">
 	<title>Portlet development</title>
@@ -10,6 +8,6 @@
 	<xi:include href="portlets/Groovy_Templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="portlets/Portlet_Lifecycle.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="portlets/Standard.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-<!-- Unedited pending new example -->	<xi:include href="portlets/Create_a_WebUI_Portlet.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> 
+	<!--  Unedited pending new example  --> <xi:include href="portlets/Create_a_WebUI_Portlet.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </chapter>
 

Modified: portal/trunk/docs/reference-guide/en/modules/SSO.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/SSO.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/SSO.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,740 +1,640 @@
-<?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">
-%BOOK_ENTITIES;
+<?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" [
 ]>
-<chapter>
+<chapter id="chap-Reference_Guide-Single_Sign_On">
 	<title>Single Sign On</title>
-
-	<section>
+	<section id="sect-Reference_Guide-Single_Sign_On-Overview_of_SSO">
 		<title>Overview of SSO</title>
-
-		<para>Portal as an integration and aggregation platform provides
-			some form
-			of SSO by itself. When you log into the portal you gain
-			access to many
-			systems through portlets using a single identity. Still
-			in many cases
-			you
-			need to integrate the portal infrastructure with
-			other SSO enabled
-			systems. There are many different Identity
-			Management solutions on
-			the
-			market. In most cases each SSO framework
-			provides its own way to plug into
-			Java EE application.</para>
-
-		<section>
+		<para>
+			Portal as an integration and aggregation platform provides some form of Single Sign On (<literal>SSO</literal>) by itself. When you log into the portal you gain access to many systems through portlets using a single identity. Still in many cases you need to integrate the portal infrastructure with other SSO enabled systems. There are many different Identity Management solutions on the market. In most cases each SSO framework provides its own way to plug into Java EE application.
+		</para>
+		<section id="sect-Reference_Guide-Overview_of_SSO-Prerequisite">
 			<title>Prerequisite</title>
-
-			<para>In this tutorial, the SSO server is installed in a Tomcat
-				installation, you can obtain Tomcat from:
-				http://tomcat.apache.org
+			<para>
+				In this tutorial, the SSO server is installed in a Tomcat installation, you can obtain Tomcat from: http://tomcat.apache.org
 			</para>
-
-			<para>Various files are required to setup the integration, all
-				the
-				packages can be found in a zip file located at:
-				http://repository.jboss.org/maven2/org/gatein/sso/sso-packaging
+			<para>
+				Various files are required to setup the integration, all the packages can be found in a zip file located at: http://repository.jboss.org/maven2/org/gatein/sso/sso-packaging
 			</para>
-
-			<para>As we are manipulating gatein.ear directly it's better to not
-				run
-				any portal extension that could override some of the data, make
-				sure
-				you
-				remove
-				$JBOSS_HOME/server/default/deploy/gatein-sample-extension.ear and
-				$JBOSS_HOME/server/default/deploy/gatein-sample-portal.ear as they
-				ship
-				by default with GateIn.</para>
+			<para>
+				As we are manipulating gatein.ear directly it&#39;s better to not run any portal extension that could override some of the data, make sure you remove $JBOSS_HOME/server/default/deploy/gatein-sample-extension.ear and $JBOSS_HOME/server/default/deploy/gatein-sample-portal.ear as they ship by default with GateIn.
+			</para>
 		</section>
-	</section>
 
-	<section>
+	</section>
+	
+	<section id="sect-Reference_Guide-Single_Sign_On-CAS_Central_Authentication_Service">
 		<title>CAS - Central Authentication Service</title>
-
 		<para>
-			This Single Sign On plugin enables seamless integration between
-			GateIn Portal and the CAS Single Sign On Framework. Details about CAS
-			can
-			be found
-			<ulink url="http://www.ja-sig.org/products/cas/">here.</ulink>
+			This Single Sign On plugin enables seamless integration between GateIn Portal and the CAS Single Sign On Framework. Details about CAS can be found <ulink url="http://www.ja-sig.org/products/cas/">here.</ulink>
 		</para>
-
-		<para>The integration consitsts in two parts, the first part
-			consists of
-			installing or configuring a CAS server, the second part
-			consists of
-			setting up the portal to use the CAS server.</para>
-
-		<section>
+		<para>
+			The integration consitsts in two parts, the first part consists of installing or configuring a CAS server, the second part consists of setting up the portal to use the CAS server.
+		</para>
+		<section id="sect-Reference_Guide-CAS_Central_Authentication_Service-CAS_server">
 			<title>CAS server</title>
-
-			<para>First we will set up the server to authenticate against
-				the portal
-				login module. You can find more information about setting
-				up the server
-				by reading the official CAS documentation, here we will
-				install the
-				CAS
-				server on Tomcat</para>
-
-			<section>
+			<para>
+				First we will set up the server to authenticate against the portal login module. You can find more information about setting up the server by reading the official CAS documentation, here we will install the CAS server on Tomcat
+			</para>
+			<section id="sect-Reference_Guide-CAS_server-Obtaining_CAS">
 				<title>Obtaining CAS</title>
-
-				<para>You can download CAS from
-					http://www.jasig.org/cas/download.</para>
-
-				<para>Once downloaded extract it in what we will call $CAS_HOME
-					from
-					now.</para>
+				<para>
+					You can download CAS from http://www.jasig.org/cas/download.
+				</para>
+				<para>
+					Once downloaded extract it in what we will call $CAS_HOME from now.
+				</para>
 			</section>
-
-			<section>
+			
+			<section id="sect-Reference_Guide-CAS_server-Modifying_CAS_server">
 				<title>Modifying CAS server</title>
-
-				<para>To simplify we will directly modify the sources so that the
-					produced web archive is configured the way we want.</para>
-
-				<para>First we will want to change the authenticaton handler to
-					use
-					the portal authentication handler:</para>
-
 				<para>
-					The CAS Server Plugin makes secure authentication callbacks to a
-					RESTful service installed on the remote GateIn server in order to
-					authenticate a user. In order for the plugin to function correctly,
-					it
-					needs to be properly configured to connect to this service. This
-					configuration is done via the
-					<emphasis>cas.war/WEB-INF/deployerConfigContext.xml
-					</emphasis>
-					file.
+					To simplify we will directly modify the sources so that the produced web archive is configured the way we want.
 				</para>
-
+				<para>
+					First we will want to change the authenticaton handler to use the portal authentication handler:
+				</para>
+				<para>
+					The CAS Server Plugin makes secure authentication callbacks to a RESTful service installed on the remote GateIn server in order to authenticate a user. In order for the plugin to function correctly, it needs to be properly configured to connect to this service. This configuration is done via the <emphasis>cas.war/WEB-INF/deployerConfigContext.xml </emphasis> file.
+				</para>
 				<orderedlist>
 					<listitem>
-						<para>Open
-							$CAS_HOME/cas-server-webapp/src/main/webapp/WEB-INF/deployerConfigContext.xml
+						<para>
+							Open $CAS_HOME/cas-server-webapp/src/main/webapp/WEB-INF/deployerConfigContext.xml
 						</para>
 					</listitem>
-
 					<listitem>
 						<para>
-							Replace:
-							<programlisting> &lt;!--
+							Replace: 
+<programlisting> &#60;!--
   | Whereas CredentialsToPrincipalResolvers identify who it is some Credentials might authenticate, 
   | AuthenticationHandlers actually authenticate credentials.  Here e declare the AuthenticationHandlers that
   | authenticate the Principals that the CredentialsToPrincipalResolvers identified.  CAS will try these handlers in turn
   | until it finds one that both supports the Credentials presented and succeeds in authenticating.
-  +--&gt;
- &lt;property name="authenticationHandlers"&gt;
-   &lt;list&gt;
-     &lt;!--
+  +--&#62;
+ &#60;property name=&#34;authenticationHandlers&#34;&#62;
+   &#60;list&#62;
+     &#60;!--
       | This is the authentication handler that authenticates services by means of callback via SSL, thereby validating
       | a server side SSL certificate.
-      +--&gt;
-     &lt;bean class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler"
-           p:httpClient-ref="httpClient" /&gt;
-     &lt;!--
+      +--&#62;
+     &#60;bean class=&#34;org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler&#34;
+           p:httpClient-ref=&#34;httpClient&#34; /&#62;
+     &#60;!--
       | This is the authentication handler declaration that every CAS deployer will need to change before deploying CAS 
       | into production.  The default SimpleTestUsernamePasswordAuthenticationHandler authenticates UsernamePasswordCredentials
       | where the username equals the password.  You will need to replace this with an AuthenticationHandler that implements your
       | local authentication strategy.  You might accomplish this by coding a new such handler and declaring
       | edu.someschool.its.cas.MySpecialHandler here, or you might use one of the handlers provided in the adaptors modules.
-      +--&gt;
-     &lt;bean
-        class="org.jasig.cas.authentication.handler.support.SimpleTestUsernamePasswordAuthenticationHandler" /&gt;
-   &lt;/list&gt;
- &lt;/property&gt;</programlisting></para>
-          </listitem>
-
-          <listitem>
-            <para>With the following (Make sure to set the host, port and
-            context with the values corresponding to your portal). Also
-            available in
-            $GATEIN_SSO/cas/plugin/WEB-INF/deployerConfigContext.xml</para>
-
-            <para><programlisting>&lt;!--
+      +--&#62;
+     &#60;bean
+        class=&#34;org.jasig.cas.authentication.handler.support.SimpleTestUsernamePasswordAuthenticationHandler&#34; /&#62;
+   &#60;/list&#62;
+ &#60;/property&#62;
+</programlisting>
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							With the following (Make sure to set the host, port and context with the values corresponding to your portal). Also available in $GATEIN_SSO/cas/plugin/WEB-INF/deployerConfigContext.xml
+						</para>
+						<para>
+							
+<programlisting>&#60;!--
  | Whereas CredentialsToPrincipalResolvers identify who it is some Credentials might authenticate, 
  | AuthenticationHandlers actually authenticate credentials.  Here we declare the AuthenticationHandlers that
  | authenticate the Principals that the CredentialsToPrincipalResolvers identified.  CAS will try these handlers in turn
  | until it finds one that both supports the Credentials presented and succeeds in authenticating.
- +--&gt;
- &lt;property name="authenticationHandlers"&gt;
-   &lt;list&gt;
-     &lt;!--
+ +--&#62;
+ &#60;property name=&#34;authenticationHandlers&#34;&#62;
+   &#60;list&#62;
+     &#60;!--
       | This is the authentication handler that authenticates services by means of callback via SSL, thereby validating
       | a server side SSL certificate.
-      +--&gt;
-     &lt;bean class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler"
-           p:httpClient-ref="httpClient" /&gt;
-     &lt;!--
+      +--&#62;
+     &#60;bean class=&#34;org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler&#34;
+           p:httpClient-ref=&#34;httpClient&#34; /&#62;
+     &#60;!--
       | This is the authentication handler declaration that every CAS deployer will need to change before deploying CAS 
       | into production.  The default SimpleTestUsernamePasswordAuthenticationHandler authenticates UsernamePasswordCredentials
       | where the username equals the password.  You will need to replace this with an AuthenticationHandler that implements your
       | local authentication strategy.  You might accomplish this by coding a new such handler and declaring
       | edu.someschool.its.cas.MySpecialHandler here, or you might use one of the handlers provided in the adaptors modules.
-      +--&gt;
-     &lt;!-- Integrates with the Gatein Authentication Service to perform authentication --&gt;
-     &lt;!--
+      +--&#62;
+     &#60;!-- Integrates with the Gatein Authentication Service to perform authentication --&#62;
+     &#60;!--
       | Note: Modify the Plugin Configuration based on the actual information of a GateIn instance.
       | The instance can be anywhere on the internet...Not necessarily on localhost where CAS is running 
-      +--&gt;
-     &lt;bean class="org.gatein.sso.cas.plugin.AuthenticationPlugin"&gt;
-        &lt;property name="gateInHost"&gt;&lt;value&gt;localhost&lt;/value&gt;&lt;/property&gt;
-        &lt;property name="gateInPort"&gt;&lt;value&gt;8080&lt;/value&gt;&lt;/property&gt;
-        &lt;property name="gateInContext"&gt;&lt;value&gt;portal&lt;/value&gt;&lt;/property&gt;
-     &lt;/bean&gt;
-   &lt;/list&gt;
- &lt;/property&gt;</programlisting></para>
-          </listitem>
+      +--&#62;
+     &#60;bean class=&#34;org.gatein.sso.cas.plugin.AuthenticationPlugin&#34;&#62;
+        &#60;property name=&#34;gateInHost&#34;&#62;&#60;value&#62;localhost&#60;/value&#62;&#60;/property&#62;
+        &#60;property name=&#34;gateInPort&#34;&#62;&#60;value&#62;8080&#60;/value&#62;&#60;/property&#62;
+        &#60;property name=&#34;gateInContext&#34;&#62;&#60;value&#62;portal&#60;/value&#62;&#60;/property&#62;
+     &#60;/bean&#62;
+   &#60;/list&#62;
+ &#60;/property&#62;
+</programlisting>
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							Copy $GATEIN_SSO/cas/plugin/WEB-INF/lib/sso-cas-plugin-&#60;VERSION&#62;.jar and $GATEIN_SSO/cas/plugin/WEB-INF/lib/commons-httpclient-&#60;VERSION&#62;.jar into the newly created directory $CAS_HOME/cas-server-webapp/src/main/webapp/WEB-INF/lib
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							Get an installation of Tomcat and extract it in what we will call $TOMCAT_HOME. Change the default port to avoid a conflict with the default GateIn (for testing purposes). Edit $TOMCAT_HOME/conf/server.xml and replace the 8080 port to 8888.
+							<note>
+								<para>
+									If you are running GateIn with Tomcat on the same machine you will also need to change the port 8005 to something else to avoid port conflicts.
+								</para>
+							</note>
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							Go to $CAS_HOME/cas-server-webapp and do &#39;mvn install&#39;
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							Copy $CAS_HOME/cas-server-webapp/target/cas.war into $TOMCAT_HOME/webapps
+						</para>
+						<para>
+							Now you should be able to start Tomcat and access http://localhost:8888/cas but at this stage you won&#39;t be able to login.
+						</para>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/cas.png" format="PNG" width="444" />
+							</imageobject>
+						</mediaobject>
+					</listitem>
+				</orderedlist>
+			</section>
 
-          <listitem>
-            <para>Copy
-            $GATEIN_SSO/cas/plugin/WEB-INF/lib/sso-cas-plugin-&lt;VERSION&gt;.jar
-            and
-            $GATEIN_SSO/cas/plugin/WEB-INF/lib/commons-httpclient-&lt;VERSION&gt;.jar
-            into the newly created directory
-            $CAS_HOME/cas-server-webapp/src/main/webapp/WEB-INF/lib</para>
-          </listitem>
-
-          <listitem>
-            <para>Get an installation of Tomcat and extract it in what we will
-            call $TOMCAT_HOME. Change the default port to avoid a conflict
-            with the default GateIn (for testing purposes). Edit
-            $TOMCAT_HOME/conf/server.xml and replace the 8080 port to
-            8888.<note>
-                <para>If you are running GateIn with Tomcat on the same
-                machine you will also need to change the port 8005 to
-                something else to avoid port conflicts.</para>
-              </note></para>
-          </listitem>
-
-          <listitem>
-            <para>Go to $CAS_HOME/cas-server-webapp and do 'mvn
-            install'</para>
-          </listitem>
-
-          <listitem>
-            <para>Copy $CAS_HOME/cas-server-webapp/target/cas.war into
-            $TOMCAT_HOME/webapps</para>
-
-            <para>Now you should be able to start Tomcat and access
-            http://localhost:8888/cas but at this stage you won't be able to
-            login.</para>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="images/cas.png" format="PNG" />
-              </imageobject>
-            </mediaobject>
-          </listitem>
-        </orderedlist>
-      </section>
-    </section>
-
-    <section>
-      <title>Setup the CAS client</title>
-
-      <orderedlist>
-        <listitem>
-          <para>Copy all libraries from $GATEIN_SSO/cas/gatein.ear/lib into
-          $JBOSS_HOME/server/default/deploy/gatein.ear/lib (Or if you are
-          running GateIn in Tomcat, in $GATEIN_HOME/lib)</para>
-        </listitem>
-
-        <listitem>
-          <para>In JBoss AS, edit gatein.ear/META-INF/gatein-jboss-beans.xml
-          and uncomment this section</para>
-
-          <para><programlisting>&lt;authentication&gt;
-  &lt;login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required"&gt;
-  &lt;/login-module&gt;      
-  &lt;login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"&gt;
-    &lt;module-option name="portalContainerName"&gt;portal&lt;/module-option&gt;
-    &lt;module-option name="realmName"&gt;gatein-domain&lt;/module-option&gt;
-  &lt;/login-module&gt;
-&lt;/authentication&gt;</programlisting></para>
-
-          <para>If you are running GateIn in Tomcat, edit
-          $GATEIN_HOME/conf/jaas.conf and uncomment this section</para>
-
-          <para><programlisting>org.gatein.sso.agent.login.SSOLoginModule required
+		</section>
+		
+		<section id="sect-Reference_Guide-CAS_Central_Authentication_Service-Setup_the_CAS_client">
+			<title>Setup the CAS client</title>
+			<orderedlist>
+				<listitem>
+					<para>
+						Copy all libraries from $GATEIN_SSO/cas/gatein.ear/lib into $JBOSS_HOME/server/default/deploy/gatein.ear/lib (Or if you are running GateIn in Tomcat, in $GATEIN_HOME/lib)
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						In JBoss AS, edit gatein.ear/META-INF/gatein-jboss-beans.xml and uncomment this section
+					</para>
+					<para>
+						
+<programlisting>&#60;authentication&#62;
+  &#60;login-module code=&#34;org.gatein.sso.agent.login.SSOLoginModule&#34; flag=&#34;required&#34;&#62;
+  &#60;/login-module&#62;      
+  &#60;login-module code=&#34;org.exoplatform.services.security.j2ee.JbossLoginModule&#34; flag=&#34;required&#34;&#62;
+    &#60;module-option name=&#34;portalContainerName&#34;&#62;portal&#60;/module-option&#62;
+    &#60;module-option name=&#34;realmName&#34;&#62;gatein-domain&#60;/module-option&#62;
+  &#60;/login-module&#62;
+&#60;/authentication&#62;
+</programlisting>
+					</para>
+					<para>
+						If you are running GateIn in Tomcat, edit $GATEIN_HOME/conf/jaas.conf and uncomment this section
+					</para>
+					<para>
+						
+<programlisting>org.gatein.sso.agent.login.SSOLoginModule required
 org.exoplatform.services.security.j2ee.JbossLoginModule required
 portalContainerName=portal
-realmName=gatein-domain</programlisting>At this point, you can test the
-          installation, start GateIn (assuming that the CAS server using
-          Tomcat is still running) by going to http://localhost:8888/cas you
-          should be able to login with username 'root' and password 'gtn' or
-          any account created through the portal.</para>
-        </listitem>
-      </orderedlist>
-    </section>
+realmName=gatein-domain
+</programlisting>
+						At this point, you can test the installation, start GateIn (assuming that the CAS server using Tomcat is still running) by going to http://localhost:8888/cas you should be able to login with username &#39;root&#39; and password &#39;gtn&#39; or any account created through the portal.
+					</para>
+				</listitem>
+			</orderedlist>
+		</section>
+		
+		<section id="sect-Reference_Guide-CAS_Central_Authentication_Service-Setup_the_portal_to_redirect_to_CAS">
+			<title>Setup the portal to redirect to CAS</title>
+			<para>
+				Now we want to tell GateIn to redirect all user authentication to the CAS server.
+			</para>
+			<para>
+				The CAS server can be located anywhere on the Internet, and this information must be properly configured within the GateIn instance. This configuration needs to be done in 3 files 
+				<itemizedlist>
+					<listitem>
+						<emphasis>In gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl replace the javascript at the bottom by:</emphasis>
+						<para>
+							
+<programlisting>&#60;script&#62;
+&#60;%=uicomponent.event(&#34;Close&#34;);%&#62;
+  window.location = &#39;http://localhost:8888/cas/login?service=http://localhost:8080/portal/private/classic&#39;;
+&#60;/script&#62;
+</programlisting>
+						</para>
+					</listitem>
+					<listitem>
+						<emphasis>In gatein.ear/02portal.war/login/jsp/login.jsp replace everything by:</emphasis>
+						<para>
+							
+<programlisting>&#60;html&#62;
+  &#60;head&#62;
+    &#60;script type=&#34;text/javascript&#34;&#62;
+       window.location = &#39;http://localhost:8888/cas/login?service=http://localhost:8080/portal/private/classic&#39;;
+    &#60;/script&#62;
+  &#60;/head&#62;
+  &#60;body&#62;
+  &#60;/body&#62;
+&#60;/html&#62;
+</programlisting>
+						</para>
+					</listitem>
+					<listitem>
+						<emphasis>In gatein.ear/02portal.war/WEB-INF/web.xml replace the InitiateLoginServlet declaration by:</emphasis>
+						<para>
+							
+<programlisting>&#60;servlet&#62;
+  &#60;servlet-name&#62;InitiateLoginServlet&#60;/servlet-name&#62;
+  &#60;servlet-class&#62;org.gatein.sso.agent.GenericSSOAgent&#60;/servlet-class&#62;
+  &#60;init-param&#62;
+    &#60;param-name&#62;ssoServerUrl&#60;/param-name&#62;
+    &#60;param-value&#62;http://localhost:8888/cas&#60;/param-value&#62;
+  &#60;/init-param&#62;    
+&#60;/servlet&#62;
+</programlisting>
+						</para>
+					</listitem>
+				</itemizedlist>
+			</para>
+			<para>
+				From now on, all links redirecting to the user authentication pages will redirect to the CAS centralized authentication form.
+			</para>
+		</section>
 
-    <section>
-      <title>Setup the portal to redirect to CAS</title>
+	</section>
+	
+	<section id="sect-Reference_Guide-Single_Sign_On-JOSSO">
+		<title>JOSSO</title>
+		<para>
+			This Single Sign On plugin enables seamless integration between GateIn Portal and the JOSSO Single Sign On Framework. Details about OpenSSO can be found <ulink url="http://www.ja-sig.org/products/cas/">here.</ulink>
+		</para>
+		<para>
+			The integration consitsts in two parts, the first part consists of installing or configuring a JOSSO server, the second part consists of setting up the portal to use the JOSSO server.
+		</para>
+		<section id="sect-Reference_Guide-JOSSO-JOSSO_server">
+			<title>JOSSO server</title>
+			<para>
+				First we will set up the server to authenticate against the portal login module. You can find more information about setting up the server by reading the official JOSSO documentation, here we will install the JOSSO server on Tomcat
+			</para>
+			<section id="sect-Reference_Guide-JOSSO_server-Obtaining_JOSSO">
+				<title>Obtaining JOSSO</title>
+				<para>
+					You can download JOSSO from http://sourceforge.net/projects/josso/files/ We will use the package that embeds Apache Tomcat.
+				</para>
+				<para>
+					Once downloaded extract it in what we will call $JOSSO_HOME from now.
+				</para>
+			</section>
+			
+			<section id="sect-Reference_Guide-JOSSO_server-Modifying_JOSSO_server">
+				<title>Modifying JOSSO server</title>
+				<orderedlist>
+					<listitem>
+						<para>
+							Copy the files from $GATEIN_SSO/josso/plugin into the Tomcat directory ($JOSSO_HOME).
+						</para>
+						<para>
+							It should replace or add $JOSSO_HOME/lib/josso-gateway-config.xml $JOSSO_HOME/lib/josso-gateway-gatein-stores.xml $JOSSO_HOME/webapps/josso/WEB-INF/classes/gatein.properties and add required jars into $JOSSO_HOME/webapps/josso/WEB-INF/lib
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							Change the default Tomcat ports to avoid a conflict with the default GateIn (for testing purposes). Edit $TOMCAT_HOME/conf/server.xml and replace the 8080 port to 8888.
+							<note>
+								<para>
+									If you are running GateIn with Tomcat on the same machine you will also need to change other ports to something else to avoid port conflicts.
+								</para>
+							</note>
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							Now you should be able to start Tomcat and access http://localhost:8888/josso/signon/login.do but at this stage you won&#39;t be able to login.
+						</para>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/opensso.png" format="PNG" width="444" />
+							</imageobject>
+						</mediaobject>
+					</listitem>
+				</orderedlist>
+			</section>
 
-      <para>Now we want to tell GateIn to redirect all user authentication to
-      the CAS server.</para>
-
-      <para>The CAS server can be located anywhere on the Internet, and this
-      information must be properly configured within the GateIn instance. This
-      configuration needs to be done in 3 files <itemizedlist>
-          <listitem>
-            <emphasis>In
-            gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl
-            replace the javascript at the bottom by:</emphasis>
-
-            <para>
-              <programlisting>&lt;script&gt;
-&lt;%=uicomponent.event("Close");%&gt;
-  window.location = 'http://localhost:8888/cas/login?service=http://localhost:8080/portal/private/classic';
-&lt;/script&gt;</programlisting>
-            </para>
-          </listitem>
-
-          <listitem>
-            <emphasis>In gatein.ear/02portal.war/login/jsp/login.jsp replace
-            everything by:</emphasis>
-
-            <para>
-              <programlisting>&lt;html&gt;
-  &lt;head&gt;
-    &lt;script type="text/javascript"&gt;
-       window.location = 'http://localhost:8888/cas/login?service=http://localhost:8080/portal/private/classic';
-    &lt;/script&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-  &lt;/body&gt;
-&lt;/html&gt;</programlisting>
-            </para>
-          </listitem>
-
-          <listitem>
-            <emphasis>In gatein.ear/02portal.war/WEB-INF/web.xml replace the
-            InitiateLoginServlet declaration by:</emphasis>
-
-            <para>
-              <programlisting>&lt;servlet&gt;
-  &lt;servlet-name&gt;InitiateLoginServlet&lt;/servlet-name&gt;
-  &lt;servlet-class&gt;org.gatein.sso.agent.GenericSSOAgent&lt;/servlet-class&gt;
-  &lt;init-param&gt;
-    &lt;param-name&gt;ssoServerUrl&lt;/param-name&gt;
-    &lt;param-value&gt;http://localhost:8888/cas&lt;/param-value&gt;
-  &lt;/init-param&gt;    
-&lt;/servlet&gt;</programlisting>
-            </para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para>From now on, all links redirecting to the user authentication
-      pages will redirect to the CAS centralized authentication form.</para>
-    </section>
-  </section>
-
-  <section>
-    <title>JOSSO</title>
-
-    <para>This Single Sign On plugin enables seamless integration between
-    GateIn Portal and the JOSSO Single Sign On Framework. Details about
-    OpenSSO can be found <ulink
-    url="http://www.ja-sig.org/products/cas/">here.</ulink></para>
-
-    <para>The integration consitsts in two parts, the first part consists of
-    installing or configuring a JOSSO server, the second part consists of
-    setting up the portal to use the JOSSO server.</para>
-
-    <section>
-      <title>JOSSO server</title>
-
-      <para>First we will set up the server to authenticate against the portal
-      login module. You can find more information about setting up the server
-      by reading the official JOSSO documentation, here we will install the
-      JOSSO server on Tomcat</para>
-
-      <section>
-        <title>Obtaining JOSSO</title>
-
-        <para>You can download JOSSO from
-        http://sourceforge.net/projects/josso/files/ We will use the package
-        that embeds Apache Tomcat.</para>
-
-        <para>Once downloaded extract it in what we will call $JOSSO_HOME from
-        now.</para>
-      </section>
-
-      <section>
-        <title>Modifying JOSSO server</title>
-
-        <orderedlist>
-          <listitem>
-            <para>Copy the files from $GATEIN_SSO/josso/plugin into the Tomcat
-            directory ($JOSSO_HOME).</para>
-
-            <para>It should replace or add
-            $JOSSO_HOME/lib/josso-gateway-config.xml
-            $JOSSO_HOME/lib/josso-gateway-gatein-stores.xml
-            $JOSSO_HOME/webapps/josso/WEB-INF/classes/gatein.properties and
-            add required jars into
-            $JOSSO_HOME/webapps/josso/WEB-INF/lib</para>
-          </listitem>
-
-          <listitem>
-            <para>Change the default Tomcat ports to avoid a conflict with the
-            default GateIn (for testing purposes). Edit
-            $TOMCAT_HOME/conf/server.xml and replace the 8080 port to
-            8888.<note>
-                <para>If you are running GateIn with Tomcat on the same
-                machine you will also need to change other ports to something
-                else to avoid port conflicts.</para>
-              </note></para>
-          </listitem>
-
-          <listitem>
-            <para>Now you should be able to start Tomcat and access
-            http://localhost:8888/josso/signon/login.do but at this stage you
-            won't be able to login.</para>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="images/opensso.png" format="PNG" />
-              </imageobject>
-            </mediaobject>
-          </listitem>
-        </orderedlist>
-      </section>
-    </section>
-
-    <section>
-      <title>Setup the JOSSO client</title>
-
-      <orderedlist>
-        <listitem>
-          <para>Copy the libs from $GATEIN_SS)/josso/gatein.ear/lib into
-          gatein.ear/lib (Or if you are running GateIn in Tomcat, in
-          $GATEIN_HOME/lib)</para>
-        </listitem>
-
-        <listitem>
-          <para>In JBoss AS, edit gatein.ear/META-INF/gatein-jboss-beans.xml
-          and uncomment this section</para>
-
-          <para><programlisting>&lt;authentication&gt;
-  &lt;login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required"&gt;
-  &lt;/login-module&gt;      
-  &lt;login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"&gt;
-    &lt;module-option name="portalContainerName"&gt;portal&lt;/module-option&gt;
-    &lt;module-option name="realmName"&gt;gatein-domain&lt;/module-option&gt;
-  &lt;/login-module&gt;
-&lt;/authentication&gt;</programlisting></para>
-
-          <para>If you are running GateIn in Tomcat, edit
-          $GATEIN_HOME/conf/jaas.conf and uncomment this section</para>
-
-          <para><programlisting>org.gatein.sso.agent.login.SSOLoginModule required
+		</section>
+		
+		<section id="sect-Reference_Guide-JOSSO-Setup_the_JOSSO_client">
+			<title>Setup the JOSSO client</title>
+			<orderedlist>
+				<listitem>
+					<para>
+						Copy the libs from $GATEIN_SS)/josso/gatein.ear/lib into gatein.ear/lib (Or if you are running GateIn in Tomcat, in $GATEIN_HOME/lib)
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						In JBoss AS, edit gatein.ear/META-INF/gatein-jboss-beans.xml and uncomment this section
+					</para>
+					<para>
+						
+<programlisting>&#60;authentication&#62;
+  &#60;login-module code=&#34;org.gatein.sso.agent.login.SSOLoginModule&#34; flag=&#34;required&#34;&#62;
+  &#60;/login-module&#62;      
+  &#60;login-module code=&#34;org.exoplatform.services.security.j2ee.JbossLoginModule&#34; flag=&#34;required&#34;&#62;
+    &#60;module-option name=&#34;portalContainerName&#34;&#62;portal&#60;/module-option&#62;
+    &#60;module-option name=&#34;realmName&#34;&#62;gatein-domain&#60;/module-option&#62;
+  &#60;/login-module&#62;
+&#60;/authentication&#62;
+</programlisting>
+					</para>
+					<para>
+						If you are running GateIn in Tomcat, edit $GATEIN_HOME/conf/jaas.conf and uncomment this section
+					</para>
+					<para>
+						
+<programlisting>org.gatein.sso.agent.login.SSOLoginModule required
 org.exoplatform.services.security.j2ee.JbossLoginModule required
 portalContainerName=portal
-realmName=gatein-domain</programlisting>At this point, you can test the
-          installation, start GateIn (assuming that the JOSSO server using
-          Tomcat is still running) by going to
-          http://localhost:8888/josso/signon/login.do you should be able to
-          login with username 'root' and password 'gtn' or any account created
-          through the portal.</para>
-        </listitem>
-      </orderedlist>
-    </section>
+realmName=gatein-domain
+</programlisting>
+						At this point, you can test the installation, start GateIn (assuming that the JOSSO server using Tomcat is still running) by going to http://localhost:8888/josso/signon/login.do you should be able to login with username &#39;root&#39; and password &#39;gtn&#39; or any account created through the portal.
+					</para>
+				</listitem>
+			</orderedlist>
+		</section>
+		
+		<section id="sect-Reference_Guide-JOSSO-Setup_the_portal_to_redirect_to_JOSSO">
+			<title>Setup the portal to redirect to JOSSO</title>
+			<para>
+				Now we want to tell GateIn to redirect all user authentication to the CAS server.
+			</para>
+			<para>
+				The CAS server can be located anywhere on the Internet, and this information must be properly configured within the GateIn instance. This configuration needs to be done in 3 files 
+				<itemizedlist>
+					<listitem>
+						<emphasis>In gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl replace the javascript at the bottom by:</emphasis>
+						<para>
+							
+<programlisting>&#60;script&#62;
+ &#60;%=uicomponent.event(&#34;Close&#34;);%&#62;
+ window.location = &#39;http://localhost:8888/josso/signon/login.do?josso_back_to=http://localhost:8080/portal/private/classic&#39;;
+&#60;/script&#62;
+</programlisting>
+						</para>
+					</listitem>
+					<listitem>
+						<emphasis>In gatein.ear/02portal.war/login/jsp/login.jsp replace everything by:</emphasis>
+						<para>
+							
+<programlisting>&#60;html&#62;
+  &#60;head&#62;
+    &#60;script type=&#34;text/javascript&#34;&#62;
+     window.location = &#39;http://localhost:8888/josso/signon/login.do?josso_back_to=http://localhost:8080/portal/private/classic&#39;;
+    &#60;/script&#62;
+  &#60;/head&#62;
+  &#60;body&#62;
+  &#60;/body&#62;
+&#60;/html&#62;
+</programlisting>
+						</para>
+					</listitem>
+					<listitem>
+						<emphasis>In gatein.ear/02portal.war/WEB-INF/web.xml replace the InitiateLoginServlet declaration by:</emphasis>
+						<para>
+							
+<programlisting>&#60;servlet&#62;
+  &#60;servlet-name&#62;InitiateLoginServlet&#60;/servlet-name&#62;
+  &#60;servlet-class&#62;org.gatein.sso.agent.GenericSSOAgent&#60;/servlet-class&#62;
+  &#60;init-param&#62;
+    &#60;param-name&#62;ssoServerUrl&#60;/param-name&#62;
+    &#60;param-value&#62;http://localhost:8888/cas&#60;/param-value&#62;
+  &#60;/init-param&#62;    
+&#60;/servlet&#62;
+</programlisting>
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							In gatein.ear/02portal.war/WEB-INF/web.xml remove the PortalLoginController servlet declaration and mapping
+						</para>
+					</listitem>
+				</itemizedlist>
+			</para>
+			<para>
+				From now on, all links redirecting to the user authentication pages will redirect to the JOSSO centralized authentication form.
+			</para>
+		</section>
 
-    <section>
-      <title>Setup the portal to redirect to JOSSO</title>
+	</section>
+	
+	<section id="sect-Reference_Guide-Single_Sign_On-OpenSSO_The_Open_Web_SSO_project">
+		<title>OpenSSO - The Open Web SSO project</title>
+		<para>
+			This Single Sign On plugin enables seamless integration between GateIn Portal and the OpenSSO Single Sign On Framework. Details about OpenSSO can be found <ulink url="https://opensso.dev.java.net/">here.</ulink>
+		</para>
+		<para>
+			The integration consitsts in two parts, the first part consists of installing or configuring an OpenSSO server, the second part consists of setting up the portal to use the OpenSSO server.
+		</para>
+		<section id="sect-Reference_Guide-OpenSSO_The_Open_Web_SSO_project-OpenSSO_server">
+			<title>OpenSSO server</title>
+			<para>
+				First we will set up the server to authenticate against the portal login module. You can find more information about setting up the server by reading the official OpenSSO documentation, here we will install the OpenSSO server on Tomcat
+			</para>
+			<section id="sect-Reference_Guide-OpenSSO_server-Obtaining_OpenSSO">
+				<title>Obtaining OpenSSO</title>
+				<para>
+					You can download OpenSSO from https://opensso.dev.java.net/public/use/index.html.
+				</para>
+				<para>
+					Once downloaded extract it in what we will call $OPENSSO_HOME from now.
+				</para>
+			</section>
+			
+			<section id="sect-Reference_Guide-OpenSSO_server-Modifying_OpenSSO_server">
+				<title>Modifying OpenSSO server</title>
+				<para>
+					To simplify we will directly modify the sources so that the produced web archive is configured the way we want.
+				</para>
+				<para>
+					First we will want to add the GateIn Authentication Plugin:
+				</para>
+				<para>
+					The plugin makes secure authentication callbacks to a RESTful service installed on the remote GateIn server in order to authenticate a user. In order for the plugin to function correctly, it needs to be properly configured to connect to this service. This configuration is done via the <emphasis>opensso.war/config/auth/default/AuthenticationPlugin.xml</emphasis> file.
+				</para>
+				<orderedlist>
+					<listitem>
+						<para>
+							Get an installation of Tomcat and extract it in what we will call $TOMCAT_HOME. Change the default port to avoid a conflict with the default GateIn (for testing purposes). Edit $TOMCAT_HOME/conf/server.xml and replace the 8080 port to 8888.
+							<note>
+								<para>
+									If you are running GateIn with Tomcat on the same machine you will also need to change the port 8005 to something else to avoid port conflicts.
+								</para>
+							</note>
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							This is what the $TOMCAT_HOME/webapps/opensso/config/auth/default/AuthenticationPlugin.xml file should look like: 
+<programlisting>
+&#60;?xml version=&#39;1.0&#39; encoding=&#34;UTF-8&#34;?&#62;
 
-      <para>Now we want to tell GateIn to redirect all user authentication to
-      the CAS server.</para>
+&#60;!DOCTYPE ModuleProperties PUBLIC &#34;=//iPlanet//Authentication Module Properties XML Interface 1.0 DTD//EN&#34;
+          &#34;jar://com/sun/identity/authentication/Auth_Module_Properties.dtd&#34;&#62;
 
-      <para>The CAS server can be located anywhere on the Internet, and this
-      information must be properly configured within the GateIn instance. This
-      configuration needs to be done in 3 files <itemizedlist>
-          <listitem>
-            <emphasis>In
-            gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl
-            replace the javascript at the bottom by:</emphasis>
-
-            <para>
-              <programlisting>&lt;script&gt;
- &lt;%=uicomponent.event("Close");%&gt;
- window.location = 'http://localhost:8888/josso/signon/login.do?josso_back_to=http://localhost:8080/portal/private/classic';
-&lt;/script&gt;</programlisting>
-            </para>
-          </listitem>
-
-          <listitem>
-            <emphasis>In gatein.ear/02portal.war/login/jsp/login.jsp replace
-            everything by:</emphasis>
-
-            <para>
-              <programlisting>&lt;html&gt;
-  &lt;head&gt;
-    &lt;script type="text/javascript"&gt;
-     window.location = 'http://localhost:8888/josso/signon/login.do?josso_back_to=http://localhost:8080/portal/private/classic';
-    &lt;/script&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-  &lt;/body&gt;
-&lt;/html&gt;</programlisting>
-            </para>
-          </listitem>
-
-          <listitem>
-            <emphasis>In gatein.ear/02portal.war/WEB-INF/web.xml replace the
-            InitiateLoginServlet declaration by:</emphasis>
-
-            <para>
-              <programlisting>&lt;servlet&gt;
-  &lt;servlet-name&gt;InitiateLoginServlet&lt;/servlet-name&gt;
-  &lt;servlet-class&gt;org.gatein.sso.agent.GenericSSOAgent&lt;/servlet-class&gt;
-  &lt;init-param&gt;
-    &lt;param-name&gt;ssoServerUrl&lt;/param-name&gt;
-    &lt;param-value&gt;http://localhost:8888/cas&lt;/param-value&gt;
-  &lt;/init-param&gt;    
-&lt;/servlet&gt;</programlisting>
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>In gatein.ear/02portal.war/WEB-INF/web.xml remove the
-            PortalLoginController servlet declaration and mapping</para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para>From now on, all links redirecting to the user authentication
-      pages will redirect to the JOSSO centralized authentication form.</para>
-    </section>
-    </section>
-    
-    <section>
-    <title>OpenSSO - The Open Web SSO project</title>
-
-    <para>This Single Sign On plugin enables seamless integration between
-    GateIn Portal and the OpenSSO Single Sign On Framework. Details about OpenSSO can
-    be found <ulink
-    url="https://opensso.dev.java.net/">here.</ulink></para>
-
-    <para>The integration consitsts in two parts, the first part consists of
-    installing or configuring an OpenSSO server, the second part consists of
-    setting up the portal to use the OpenSSO server.</para>
-
-    <section>
-      <title>OpenSSO server</title>
-
-      <para>First we will set up the server to authenticate against the portal
-      login module. You can find more information about setting up the server
-      by reading the official OpenSSO documentation, here we will install the OpenSSO
-      server on Tomcat</para>
-
-      <section>
-        <title>Obtaining OpenSSO</title>
-
-        <para>You can download OpenSSO from
-        https://opensso.dev.java.net/public/use/index.html.</para>
-
-        <para>Once downloaded extract it in what we will call $OPENSSO_HOME from
-        now.</para>
-      </section>
-
-      <section>
-        <title>Modifying OpenSSO server</title>
-
-        <para>To simplify we will directly modify the sources so that the
-        produced web archive is configured the way we want.</para>
-
-        <para>First we will want to add the GateIn Authentication Plugin:</para>
-
-        <para>The plugin makes secure authentication callbacks to a
-        RESTful service installed on the remote GateIn server in order to
-        authenticate a user. In order for the plugin to function correctly, it
-        needs to be properly configured to connect to this service. This
-        configuration is done via the
-        <emphasis>opensso.war/config/auth/default/AuthenticationPlugin.xml</emphasis>
-        file.</para>
-
-        <orderedlist>
-          <listitem>
-            <para>Get an installation of Tomcat and extract it in what we will
-            call $TOMCAT_HOME. Change the default port to avoid a conflict
-            with the default GateIn (for testing purposes). Edit
-            $TOMCAT_HOME/conf/server.xml and replace the 8080 port to
-            8888.<note>
-                <para>If you are running GateIn with Tomcat on the same
-                machine you will also need to change the port 8005 to
-                something else to avoid port conflicts.</para>
-              </note></para>
-          </listitem>
-          
-          <listitem>
-            <para>This is what the $TOMCAT_HOME/webapps/opensso/config/auth/default/AuthenticationPlugin.xml file should look like:
-            <programlisting><![CDATA[
-<?xml version='1.0' encoding="UTF-8"?>
-
-<!DOCTYPE ModuleProperties PUBLIC "=//iPlanet//Authentication Module Properties XML Interface 1.0 DTD//EN"
-          "jar://com/sun/identity/authentication/Auth_Module_Properties.dtd">
-
-<ModuleProperties moduleName="AuthenticationPlugin" version="1.0" >
-  <Callbacks length="2" order="1" timeout="60"
-             header="GateIn OpenSSO Login" >    
-    <NameCallback>
-      <Prompt>
+&#60;ModuleProperties moduleName=&#34;AuthenticationPlugin&#34; version=&#34;1.0&#34; &#62;
+  &#60;Callbacks length=&#34;2&#34; order=&#34;1&#34; timeout=&#34;60&#34;
+             header=&#34;GateIn OpenSSO Login&#34; &#62;    
+    &#60;NameCallback&#62;
+      &#60;Prompt&#62;
 		Username
-      </Prompt>
-    </NameCallback>
-    <PasswordCallback echoPassword="false" >
-      <Prompt>
+      &#60;/Prompt&#62;
+    &#60;/NameCallback&#62;
+    &#60;PasswordCallback echoPassword=&#34;false&#34; &#62;
+      &#60;Prompt&#62;
 		Password
-      </Prompt>
-    </PasswordCallback>
-  </Callbacks>
-</ModuleProperties>
-            ]]></programlisting>
-            </para>
-          </listitem>
-          
-          
+      &#60;/Prompt&#62;
+    &#60;/PasswordCallback&#62;
+  &#60;/Callbacks&#62;
+&#60;/ModuleProperties&#62;
+</programlisting>
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							Copy $GATEIN_SSO/opensso/plugin/WEB-INF/lib/sso-opensso-plugin-&#60;VERSION&#62;.jar , $GATEIN_SSO/opensso/plugin/WEB-INF/lib/commons-httpclient-&#60;VERSION&#62;.jar, and $GATEIN_SSO/opensso/plugin/WEB-INF/lib/commons-logging-&#60;VERSION&#62;.jar into the Tomcat Installation at: $TOMCAT_HOME/webapps/opensso/WEB-INF/lib
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							Copy $GATEIN_SSO/opensso/plugin/WEB-INF/classes/gatein.properties into the Tomcat Installation at: $TOMCAT_HOME/webapps/opensso/WEB-INF/classes
+						</para>
+					</listitem>
+					<listitem>
+						<para>
+							Now you should be able to start Tomcat and access http://localhost:8888/opensso/UI/Login?realm=gatein but at this stage you won&#39;t be able to login.
+						</para>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="images/opensso-shot.png" format="PNG" />
+							</imageobject>
+						</mediaobject>
+					</listitem>
+				</orderedlist>
+			</section>
 
-          <listitem>
-            <para>Copy
-            $GATEIN_SSO/opensso/plugin/WEB-INF/lib/sso-opensso-plugin-&lt;VERSION&gt;.jar
-            , 
-            $GATEIN_SSO/opensso/plugin/WEB-INF/lib/commons-httpclient-&lt;VERSION&gt;.jar, and
-            $GATEIN_SSO/opensso/plugin/WEB-INF/lib/commons-logging-&lt;VERSION&gt;.jar
-            into the Tomcat Installation at:
-            $TOMCAT_HOME/webapps/opensso/WEB-INF/lib</para>
-          </listitem>
-          
-          <listitem>
-            <para>Copy
-            $GATEIN_SSO/opensso/plugin/WEB-INF/classes/gatein.properties
-            into the Tomcat Installation at:
-            $TOMCAT_HOME/webapps/opensso/WEB-INF/classes</para>
-          </listitem>
-          
-          <listitem>
-            <para>Now you should be able to start Tomcat and access
-            http://localhost:8888/opensso/UI/Login?realm=gatein but at this stage you won't be able to
-            login.</para>
-
-            <mediaobject>
-              <imageobject>
-              
-                <imagedata fileref="images/opensso-shot.png" format="PNG" />
-              </imageobject>
-            </mediaobject>
-          </listitem>
-        </orderedlist>
-      </section>
-    </section>
-
-    <section>
-      <title>Setup the OpenSSO client</title>
-
-      <orderedlist>
-        <listitem>
-          <para>Copy all libraries from $GATEIN_SSO/opensso/gatein.ear/lib into
-          $JBOSS_HOME/server/default/deploy/gatein.ear/lib (Or if you are
-          running GateIn in Tomcat, in $GATEIN_HOME/lib)</para>
-        </listitem>
-
-        <listitem>
-          <para>In JBoss AS, edit gatein.ear/META-INF/gatein-jboss-beans.xml
-          and uncomment this section</para>
-
-          <para><programlisting>&lt;authentication&gt;
-  &lt;login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required"&gt;
-  &lt;/login-module&gt;      
-  &lt;login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"&gt;
-    &lt;module-option name="portalContainerName"&gt;portal&lt;/module-option&gt;
-    &lt;module-option name="realmName"&gt;gatein-domain&lt;/module-option&gt;
-  &lt;/login-module&gt;
-&lt;/authentication&gt;</programlisting></para>
-
-          <para>If you are running GateIn in Tomcat, edit
-          $GATEIN_HOME/conf/jaas.conf and uncomment this section</para>
-
-          <para><programlisting>org.gatein.sso.agent.login.SSOLoginModule required
+		</section>
+		
+		<section id="sect-Reference_Guide-OpenSSO_The_Open_Web_SSO_project-Setup_the_OpenSSO_client">
+			<title>Setup the OpenSSO client</title>
+			<orderedlist>
+				<listitem>
+					<para>
+						Copy all libraries from $GATEIN_SSO/opensso/gatein.ear/lib into $JBOSS_HOME/server/default/deploy/gatein.ear/lib (Or if you are running GateIn in Tomcat, in $GATEIN_HOME/lib)
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						In JBoss AS, edit gatein.ear/META-INF/gatein-jboss-beans.xml and uncomment this section
+					</para>
+					<para>
+						
+<programlisting>&#60;authentication&#62;
+  &#60;login-module code=&#34;org.gatein.sso.agent.login.SSOLoginModule&#34; flag=&#34;required&#34;&#62;
+  &#60;/login-module&#62;      
+  &#60;login-module code=&#34;org.exoplatform.services.security.j2ee.JbossLoginModule&#34; flag=&#34;required&#34;&#62;
+    &#60;module-option name=&#34;portalContainerName&#34;&#62;portal&#60;/module-option&#62;
+    &#60;module-option name=&#34;realmName&#34;&#62;gatein-domain&#60;/module-option&#62;
+  &#60;/login-module&#62;
+&#60;/authentication&#62;
+</programlisting>
+					</para>
+					<para>
+						If you are running GateIn in Tomcat, edit $GATEIN_HOME/conf/jaas.conf and uncomment this section
+					</para>
+					<para>
+						
+<programlisting>org.gatein.sso.agent.login.SSOLoginModule required
 org.exoplatform.services.security.j2ee.JbossLoginModule required
 portalContainerName=portal
-realmName=gatein-domain</programlisting>At this point, you can test the
-          installation, start GateIn (assuming that the OpenSSO server using
-          Tomcat is still running) by going to http://localhost:8888/opensso/UI/Login?realm=gatein you
-          should be able to login with username 'root' and password 'gtn' or
-          any account created through the portal.</para>
-        </listitem>
-      </orderedlist>
-    </section>
+realmName=gatein-domain
+</programlisting>
+						At this point, you can test the installation, start GateIn (assuming that the OpenSSO server using Tomcat is still running) by going to http://localhost:8888/opensso/UI/Login?realm=gatein you should be able to login with username &#39;root&#39; and password &#39;gtn&#39; or any account created through the portal.
+					</para>
+				</listitem>
+			</orderedlist>
+		</section>
+		
+		<section id="sect-Reference_Guide-OpenSSO_The_Open_Web_SSO_project-Setup_the_portal_to_redirect_to_OpenSSO">
+			<title>Setup the portal to redirect to OpenSSO</title>
+			<para>
+				Now we want to tell GateIn to redirect all user authentication to the OpenSSO server.
+			</para>
+			<para>
+				The OpenSSO server can be located anywhere on the Internet, and this information must be properly configured within the GateIn instance. This configuration needs to be done in 3 files 
+				<itemizedlist>
+					<listitem>
+						<emphasis>In gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl replace the javascript at the bottom by:</emphasis>
+						<para>
+							
+<programlisting>&#60;script&#62;
+&#60;%=uicomponent.event(&#34;Close&#34;);%&#62;
+  window.location = &#39;http://localhost:8888/opensso/UI/Login?realm=gatein&#38;goto=http://localhost:8080/portal/private/classic&#39;;
+&#60;/script&#62;
+</programlisting>
+						</para>
+					</listitem>
+					<listitem>
+						<emphasis>In gatein.ear/02portal.war/login/jsp/login.jsp replace everything by:</emphasis>
+						<para>
+							
+<programlisting>&#60;html&#62;
+  &#60;head&#62;
+    &#60;script type=&#34;text/javascript&#34;&#62;
+       window.location = &#39;http://localhost:8888/opensso/UI/Login?realm=gatein&#38;goto=http://localhost:8080/portal/private/classic&#39;;
+    &#60;/script&#62;
+  &#60;/head&#62;
+  &#60;body&#62;
+  &#60;/body&#62;
+&#60;/html&#62;
+</programlisting>
+						</para>
+					</listitem>
+					<listitem>
+						<emphasis>In gatein.ear/02portal.war/WEB-INF/web.xml replace the InitiateLoginServlet declaration by:</emphasis>
+						<para>
+							
+<programlisting>&#60;servlet&#62;
+  &#60;servlet-name&#62;InitiateLoginServlet&#60;/servlet-name&#62;
+  &#60;servlet-class&#62;org.gatein.sso.agent.GenericSSOAgent&#60;/servlet-class&#62;
+  &#60;init-param&#62;
+    &#60;param-name&#62;ssoServerUrl&#60;/param-name&#62;
+    &#60;param-value&#62;http://localhost:8888/opensso&#60;/param-value&#62;
+  &#60;/init-param&#62;
+  &#60;init-param&#62;
+    &#60;param-name&#62;ssoCookieName&#60;/param-name&#62;
+    &#60;param-value&#62;iPlanetDirectoryPro&#60;/param-value&#62;
+  &#60;/init-param&#62;    
+&#60;/servlet&#62;
+</programlisting>
+						</para>
+					</listitem>
+				</itemizedlist>
+			</para>
+			<para>
+				From now on, all links redirecting to the user authentication pages will redirect to the OpenSSO centralized authentication form.
+			</para>
+		</section>
 
-    <section>
-      <title>Setup the portal to redirect to OpenSSO</title>
+	</section>
 
-      <para>Now we want to tell GateIn to redirect all user authentication to
-      the OpenSSO server.</para>
-
-      <para>The OpenSSO server can be located anywhere on the Internet, and this
-      information must be properly configured within the GateIn instance. This
-      configuration needs to be done in 3 files <itemizedlist>
-          <listitem>
-            <emphasis>In
-            gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl
-            replace the javascript at the bottom by:</emphasis>
-
-            <para>
-              <programlisting>&lt;script&gt;
-&lt;%=uicomponent.event("Close");%&gt;
-  window.location = 'http://localhost:8888/opensso/UI/Login?realm=gatein&amp;goto=http://localhost:8080/portal/private/classic';
-&lt;/script&gt;</programlisting>
-            </para>
-          </listitem>
-
-          <listitem>
-            <emphasis>In gatein.ear/02portal.war/login/jsp/login.jsp replace
-            everything by:</emphasis>
-
-            <para>
-              <programlisting>&lt;html&gt;
-  &lt;head&gt;
-    &lt;script type="text/javascript"&gt;
-       window.location = 'http://localhost:8888/opensso/UI/Login?realm=gatein&amp;goto=http://localhost:8080/portal/private/classic';
-    &lt;/script&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-  &lt;/body&gt;
-&lt;/html&gt;</programlisting>
-            </para>
-          </listitem>
-
-          <listitem>
-            <emphasis>In gatein.ear/02portal.war/WEB-INF/web.xml replace the
-            InitiateLoginServlet declaration by:</emphasis>
-
-            <para>
-              <programlisting>&lt;servlet&gt;
-  &lt;servlet-name&gt;InitiateLoginServlet&lt;/servlet-name&gt;
-  &lt;servlet-class&gt;org.gatein.sso.agent.GenericSSOAgent&lt;/servlet-class&gt;
-  &lt;init-param&gt;
-    &lt;param-name&gt;ssoServerUrl&lt;/param-name&gt;
-    &lt;param-value&gt;http://localhost:8888/opensso&lt;/param-value&gt;
-  &lt;/init-param&gt;
-  &lt;init-param&gt;
-    &lt;param-name&gt;ssoCookieName&lt;/param-name&gt;
-    &lt;param-value&gt;iPlanetDirectoryPro&lt;/param-value&gt;
-  &lt;/init-param&gt;    
-&lt;/servlet&gt;</programlisting>
-            </para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para>From now on, all links redirecting to the user authentication
-      pages will redirect to the OpenSSO centralized authentication form.</para>
-    </section>
-  </section>
 </chapter>
+

Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Authentication_Token_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Authentication_Token_Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Authentication_Token_Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,18 +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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Authentication_Token_Configuration">
 	<title>Authentication Token Configuration</title>
-	
 	<section id="sect-Reference_Guide-Authentication_Token_Configuration-What_is_token_service">
 		<title>What is token service</title>
 		<para>
 			<emphasis>Token service</emphasis> is used in authentication.
 		</para>
 		<para>
-			The token system prevents user account information being sent in clear text mode for inbound requests.  This increases authentication security.
+			The token system prevents user account information being sent in clear text mode for inbound requests. This increases authentication security.
 		</para>
 		<para>
 			Token service allows adminitrators to create, delete, retrieve and clean tokens as required. The service also defines the validity period of any given token. The token becomes invalid once this period has expired, . The life-time definition must be configured.
@@ -20,9 +17,9 @@
 	</section>
 	
 	<section id="sect-Reference_Guide-Authentication_Token_Configuration-Implement_token_services_API">
-		<title>Implement token service's API</title>
+		<title>Implement token service&#39;s API</title>
 		<para>
-			All token services used in &PRODUCT;'s authentication must be a subclass of an abstract class <emphasis role="bold">AbstractTokenService</emphasis>. The following example shows how the token-service manipulates its tokens.
+			All token services used in &PRODUCT;&#39;s authentication must be a subclass of an abstract class <emphasis role="bold">AbstractTokenService</emphasis>. The following example shows how the token-service manipulates its tokens.
 		</para>
 		
 <programlisting role="JAVA">
@@ -34,7 +31,6 @@
 		public Credentials validateToken(String tokenKey, boolean remove) throws NullPointerException;
 </programlisting>
 		<para>
-			
 		</para>
 	</section>
 	
@@ -44,10 +40,10 @@
 			Token services configuration includes specifying the validity period time of token in the configuration file. The token service is configured as a portal component.
 		</para>
 		<para>
-		In the example below, <emphasis>CookieTokenService</emphasis> is a subclass of <emphasis role="bold">AbstractTokenService</emphasis> so it has a property which specifies the validity period of the token.
+			In the example below, <emphasis>CookieTokenService</emphasis> is a subclass of <emphasis role="bold">AbstractTokenService</emphasis> so it has a property which specifies the validity period of the token.
 		</para>
 		<para>
-			The token service will initiate this validity property by looking for an <parameter>init-param</parameter> named "<emphasis role="bold">service.configuration</emphasis>". 
+			The token service will initiate this validity property by looking for an <parameter>init-param</parameter> named &#34;<emphasis role="bold">service.configuration</emphasis>&#34;.
 		</para>
 		<para>
 			This property must have three values.
@@ -58,22 +54,21 @@
 				<area coords="8" id="area-Reference_Guide-Authentication_Token_Configuration-Configure_token_services-time" />
 				<area coords="9" id="area-Reference_Guide-Authentication_Token_Configuration-Configure_token_services-unit" />
 			</areaspec>
-
-<programlisting role="XML">&lt;component&gt;
-  &lt;key&gt;org.exoplatform.web.security.security.CookieTokenService&lt;/key&gt;
-  &lt;type&gt;org.exoplatform.web.security.security.CookieTokenService&lt;/type&gt;
-  &lt;init-params&gt;
-  	&lt;values-param&gt;
-      &lt;name&gt;tokenTimeout&lt;/name&gt;          
-      &lt;value&gt;jcr-token&lt;/value&gt;
-      &lt;value&gt;7&lt;/value&gt;
-      &lt;value&gt;DAY&lt;/value&gt;
-    &lt;/values-param&gt;    	
-  &lt;/init-params&gt;
-&lt;/component&gt;
+			
+<programlisting role="XML">&#60;component&#62;
+  &#60;key&#62;org.exoplatform.web.security.security.CookieTokenService&#60;/key&#62;
+  &#60;type&#62;org.exoplatform.web.security.security.CookieTokenService&#60;/type&#62;
+  &#60;init-params&#62;
+  	&#60;values-param&#62;
+      &#60;name&#62;tokenTimeout&#60;/name&#62;          
+      &#60;value&#62;jcr-token&#60;/value&#62;
+      &#60;value&#62;7&#60;/value&#62;
+      &#60;value&#62;DAY&#60;/value&#62;
+    &#60;/values-param&#62;    	
+  &#60;/init-params&#62;
+&#60;/component&#62;
 </programlisting>
-
-		<calloutlist>
+			<calloutlist>
 				<callout arearefs="area-Reference_Guide-Authentication_Token_Configuration-Configure_token_services-name">
 					<para>
 						Service name
@@ -89,13 +84,14 @@
 						Unit of time
 					</para>
 				</callout>
-		</calloutlist>
+			</calloutlist>
 		</programlistingco>
+		
 		<para>
-			In this case, the service's name is "<emphasis role="bold">jcr-token</emphasis>" and the token's expiration time is a week.
+			In this case, the service&#39;s name is &#34;<emphasis role="bold">jcr-token</emphasis>&#34; and the token&#39;s expiration time is a week.
 		</para>
 		<para>
-			&PRODUCT; supports <emphasis>four</emphasis> timing units: 
+			&PRODUCT; supports <emphasis>four</emphasis> timing units:
 		</para>
 		<orderedlist numeration="arabic">
 			<listitem>
@@ -120,6 +116,7 @@
 			</listitem>
 		</orderedlist>
 	</section>
+
 </section>
 
 

Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Dashboard_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Dashboard_Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Dashboard_Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,52 +1,50 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Dashboard_configuration">
 	<title>Dashboard configuration</title>
-		 <para>
-		 	The following parameters are available controll the Dashboard configuration (when in edit mode):
-		 </para>
-		<formalpara>
-			<title>owner</title>
-				<para>
-					<orderedlist numeration="arabic">
-						<listitem>
-							<para>
-								if empty, everyone share the same dashboard and can edit it
-							</para>
-						</listitem>
-						<listitem>
-							<para>
-								if set to <emphasis>CURRENTUSER</emphasis> , every user has his own dashboard
-							</para>
-						</listitem>
-						<listitem>
-							<para>
-								if set to a username, everyone will see the dashboard of this person
-							</para>
-						</listitem>
-					</orderedlist>
-				</para>
-		</formalpara>
-		<formalpara>
-			<title>isPrivate</title>
-				<para>
-					<orderedlist numeration="arabic">
-						<listitem>
-							<para>
-								if set to 1, only the owner of the dashboard can edit it
-							</para>
-						</listitem>
-						<listitem>
-							<para>
-								if set to 0, everyone can edit it
-							</para>
-						</listitem>
-					</orderedlist>
-				</para>
-		</formalpara>
+	<para>
+		The following parameters are available controll the Dashboard configuration (when in edit mode):
+	</para>
+	<formalpara id="form-Reference_Guide-Dashboard_configuration-owner">
+		<title>owner</title>
+		<para>
+			<orderedlist numeration="arabic">
+				<listitem>
+					<para>
+						if empty, everyone share the same dashboard and can edit it
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						if set to <emphasis>CURRENTUSER</emphasis> , every user has his own dashboard
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						if set to a username, everyone will see the dashboard of this person
+					</para>
+				</listitem>
+			</orderedlist>
+		</para>
+	</formalpara>
+	<formalpara id="form-Reference_Guide-Dashboard_configuration-isPrivate">
+		<title>isPrivate</title>
+		<para>
+			<orderedlist numeration="arabic">
+				<listitem>
+					<para>
+						if set to 1, only the owner of the dashboard can edit it
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						if set to 0, everyone can edit it
+					</para>
+				</listitem>
+			</orderedlist>
+		</para>
+	</formalpara>
 </section>
 
 

Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Data_Injector_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Data_Injector_Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Data_Injector_Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,18 +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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Data_Injector_Configuration">
 	<title>Data Injector Configuration</title>
 	<section id="sect-Reference_Guide-Data_Injector_Configuration-Data_Injector">
 		<title>Data Injector</title>
 		<para>
-			<emphasis>Data-injector</emphasis> is a utility to initialize enterprise data for &PRODUCT;. It is packed as a .jar. 
-<!-- 
+			<emphasis>Data-injector</emphasis> is a utility to initialize enterprise data for &PRODUCT;. It is packed as a .jar. <!--  
             and deployed under $TOMCATHOME/lib. It is started
             automatically when Tomcat starts.
-          -->
+           -->
 		</para>
 	</section>
 	
@@ -21,73 +18,74 @@
 		<para>
 			<emphasis>OrganizationInitializer</emphasis> is the service that allows creating a large organization with many groups and users. It also creates portal navigation and page(s) for each group and each user.
 		</para>
-		<formalpara >
-		<title>Service configuration file</title>
+		<formalpara id="form-Reference_Guide-OrganizationInitializer-Service_configuration_file">
+			<title>Service configuration file</title>
 			<para>
-<programlisting role="XML">&lt;configuration&gt;
-  &lt;component&gt;
-  &lt;key&gt;org.exoplatform.portal.initializer.organization.OrganizationInitializer&lt;/key&gt;
-  &lt;type&gt;org.exoplatform.portal.initializer.organization.OrganizationInitializer&lt;/type&gt;
-    &lt;init-params&gt;
-      &lt;value-param&gt;
-        &lt;name&gt;auto.create.group.page.navigation&lt;/name&gt;
-        &lt;description&gt;true or false&lt;/description&gt;
-        &lt;value&gt;true&lt;/value&gt;
-      &lt;/value-param&gt;
+				
+<programlisting role="XML">&#60;configuration&#62;
+  &#60;component&#62;
+  &#60;key&#62;org.exoplatform.portal.initializer.organization.OrganizationInitializer&#60;/key&#62;
+  &#60;type&#62;org.exoplatform.portal.initializer.organization.OrganizationInitializer&#60;/type&#62;
+    &#60;init-params&#62;
+      &#60;value-param&#62;
+        &#60;name&#62;auto.create.group.page.navigation&#60;/name&#62;
+        &#60;description&#62;true or false&#60;/description&#62;
+        &#60;value&#62;true&#60;/value&#62;
+      &#60;/value-param&#62;
        
-      &lt;value-param&gt;
-        &lt;name&gt;auto.create.user.page.navigation&lt;/name&gt;
-        &lt;description&gt;number of pages per user&lt;/description&gt;
-        &lt;value&gt;10&lt;/value&gt;
-      &lt;/value-param&gt;
+      &#60;value-param&#62;
+        &#60;name&#62;auto.create.user.page.navigation&#60;/name&#62;
+        &#60;description&#62;number of pages per user&#60;/description&#62;
+        &#60;value&#62;10&#60;/value&#62;
+      &#60;/value-param&#62;
       
-      &lt;object-param&gt;
-        &lt;name&gt;organization&lt;/name&gt;
-        &lt;description&gt;description&lt;/description&gt;
-        &lt;object type="org.exoplatform.portal.initializer.organization.OrganizationConfig"&gt;
-          &lt;field name="groups"&gt;
-            &lt;collection type="java.util.ArrayList"&gt;
-              &lt;value&gt;
-                &lt;object type="org.exoplatform.portal.initializer.organization.OrganizationConfig$GroupsConfig"&gt;
-                  &lt;field name="group"&gt;
-                    &lt;object type="org.exoplatform.services.organization.OrganizationConfig$Group"&gt;
-                      &lt;field name="name"&gt;&lt;string&gt;province&lt;/string&gt;&lt;/field&gt;
-                      &lt;field name="parentId"&gt;&lt;string&gt;/africa/tanzania&lt;/string&gt;&lt;/field&gt;
-                      &lt;field name="description"&gt;&lt;string&gt;Tanzania's province&lt;/string&gt;&lt;/field&gt;
-                      &lt;field name="label"&gt;&lt;string&gt;Province&lt;/string&gt;&lt;/field&gt;
-                    &lt;/object&gt;                
-                  &lt;/field&gt; 
-                  &lt;field name="from"&gt;&lt;string&gt;1&lt;/string&gt;&lt;/field&gt;
-                  &lt;field name="to"&gt;&lt;string&gt;10&lt;/string&gt;&lt;/field&gt;
-                &lt;/object&gt;
-              &lt;/value&gt;
-            &lt;/collection&gt;
-          &lt;/field&gt;
-          &lt;field name="users"&gt;
-            &lt;collection type="java.util.ArrayList"&gt; 
-              &lt;value&gt;
-                &lt;object type="org.exoplatform.portal.initializer.organization.OrganizationConfig$UsersConfig"&gt;
-                  &lt;field name="user"&gt;
-                    &lt;object type="org.exoplatform.services.organization.OrganizationConfig$User"&gt;
-                      &lt;field name="userName"&gt;&lt;string&gt;user&lt;/string&gt;&lt;/field&gt;
-                      &lt;field name="password"&gt;&lt;string&gt;GateInPlatform&lt;/string&gt;&lt;/field&gt;
-                      &lt;field name="firstName"&gt;&lt;string&gt;First-Name&lt;/string&gt;&lt;/field&gt;
-                      &lt;field name="lastName"&gt;&lt;string&gt;Last-Name&lt;/string&gt;&lt;/field&gt;
-                      &lt;field name="email"&gt;&lt;string&gt;exo at localhost&lt;/string&gt;&lt;/field&gt;
-                      &lt;field name="groups"&gt;&lt;string&gt;member:/africa&lt;/string&gt;&lt;/field&gt;
-                    &lt;/object&gt;
-                  &lt;/field&gt;
-                  &lt;field name="from"&gt;&lt;string&gt;0&lt;/string&gt;&lt;/field&gt;
-                  &lt;field name="to"&gt;&lt;string&gt;9&lt;/string&gt;&lt;/field&gt;
-                &lt;/object&gt;
-              &lt;/value&gt;
-            &lt;/collection&gt;
-          &lt;/field&gt;
-        &lt;/object&gt;
-      &lt;/object-param&gt;
-    &lt;/init-params&gt;
-  &lt;/component&gt;  
-&lt;/configuration&gt;
+      &#60;object-param&#62;
+        &#60;name&#62;organization&#60;/name&#62;
+        &#60;description&#62;description&#60;/description&#62;
+        &#60;object type=&#34;org.exoplatform.portal.initializer.organization.OrganizationConfig&#34;&#62;
+          &#60;field name=&#34;groups&#34;&#62;
+            &#60;collection type=&#34;java.util.ArrayList&#34;&#62;
+              &#60;value&#62;
+                &#60;object type=&#34;org.exoplatform.portal.initializer.organization.OrganizationConfig$GroupsConfig&#34;&#62;
+                  &#60;field name=&#34;group&#34;&#62;
+                    &#60;object type=&#34;org.exoplatform.services.organization.OrganizationConfig$Group&#34;&#62;
+                      &#60;field name=&#34;name&#34;&#62;&#60;string&#62;province&#60;/string&#62;&#60;/field&#62;
+                      &#60;field name=&#34;parentId&#34;&#62;&#60;string&#62;/africa/tanzania&#60;/string&#62;&#60;/field&#62;
+                      &#60;field name=&#34;description&#34;&#62;&#60;string&#62;Tanzania&#39;s province&#60;/string&#62;&#60;/field&#62;
+                      &#60;field name=&#34;label&#34;&#62;&#60;string&#62;Province&#60;/string&#62;&#60;/field&#62;
+                    &#60;/object&#62;                
+                  &#60;/field&#62; 
+                  &#60;field name=&#34;from&#34;&#62;&#60;string&#62;1&#60;/string&#62;&#60;/field&#62;
+                  &#60;field name=&#34;to&#34;&#62;&#60;string&#62;10&#60;/string&#62;&#60;/field&#62;
+                &#60;/object&#62;
+              &#60;/value&#62;
+            &#60;/collection&#62;
+          &#60;/field&#62;
+          &#60;field name=&#34;users&#34;&#62;
+            &#60;collection type=&#34;java.util.ArrayList&#34;&#62; 
+              &#60;value&#62;
+                &#60;object type=&#34;org.exoplatform.portal.initializer.organization.OrganizationConfig$UsersConfig&#34;&#62;
+                  &#60;field name=&#34;user&#34;&#62;
+                    &#60;object type=&#34;org.exoplatform.services.organization.OrganizationConfig$User&#34;&#62;
+                      &#60;field name=&#34;userName&#34;&#62;&#60;string&#62;user&#60;/string&#62;&#60;/field&#62;
+                      &#60;field name=&#34;password&#34;&#62;&#60;string&#62;GateInPlatform&#60;/string&#62;&#60;/field&#62;
+                      &#60;field name=&#34;firstName&#34;&#62;&#60;string&#62;First-Name&#60;/string&#62;&#60;/field&#62;
+                      &#60;field name=&#34;lastName&#34;&#62;&#60;string&#62;Last-Name&#60;/string&#62;&#60;/field&#62;
+                      &#60;field name=&#34;email&#34;&#62;&#60;string&#62;exo at localhost&#60;/string&#62;&#60;/field&#62;
+                      &#60;field name=&#34;groups&#34;&#62;&#60;string&#62;member:/africa&#60;/string&#62;&#60;/field&#62;
+                    &#60;/object&#62;
+                  &#60;/field&#62;
+                  &#60;field name=&#34;from&#34;&#62;&#60;string&#62;0&#60;/string&#62;&#60;/field&#62;
+                  &#60;field name=&#34;to&#34;&#62;&#60;string&#62;9&#60;/string&#62;&#60;/field&#62;
+                &#60;/object&#62;
+              &#60;/value&#62;
+            &#60;/collection&#62;
+          &#60;/field&#62;
+        &#60;/object&#62;
+      &#60;/object-param&#62;
+    &#60;/init-params&#62;
+  &#60;/component&#62;  
+&#60;/configuration&#62;
 </programlisting>
 			</para>
 		</formalpara>
@@ -96,118 +94,117 @@
 	<section id="sect-Reference_Guide-Data_Injector_Configuration-Group_Parameters">
 		<title>Group Parameters</title>
 		<variablelist>
-		  <varlistentry>
-			<term>Name</term>
-			<listitem>
-				<para>
-					The name of the group.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>ParentId</term>
-			<listitem>
-				<para>
-					The ID of the parent group. If the parent ID is null the group is at the first level. If parent groups do not exist, this ID will be created automatically.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>Description</term>
-			<listitem>
-				<para>
-					A description of the group.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>Label</term>
-			<listitem>
-				<para>
-					A label for the group.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>From and to</term>
-			<listitem>
-				<para>
-					This group can be cloned to may copies and each copy is marked with a number.
-				</para>
-			</listitem>
-		</varlistentry>
+			<varlistentry>
+				<term>Name</term>
+				<listitem>
+					<para>
+						The name of the group.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>ParentId</term>
+				<listitem>
+					<para>
+						The ID of the parent group. If the parent ID is null the group is at the first level. If parent groups do not exist, this ID will be created automatically.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>Description</term>
+				<listitem>
+					<para>
+						A description of the group.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>Label</term>
+				<listitem>
+					<para>
+						A label for the group.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>From and to</term>
+				<listitem>
+					<para>
+						This group can be cloned to may copies and each copy is marked with a number.
+					</para>
+				</listitem>
+			</varlistentry>
 		</variablelist>
 	</section>
 	
 	<section id="sect-Reference_Guide-Data_Injector_Configuration-User_Parameters">
 		<title>User Parameters</title>
 		<variablelist>
-		<varlistentry>
-			<term>UserName</term>
-			<listitem>
-				<para>
-					The user's ID.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>Password</term>
-			<listitem>
-				<para>
-					The user's password.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>FirstName</term>
-			<listitem>
-				<para>
-
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>LastName</term>
-			<listitem>
-				<para>
- last name.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>Email</term>
-			<listitem>
-				<para>
-					The user's email address.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>Groups</term>
-
-			<listitem>
-				<para>
-					A list of the groups that user belongs to.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>From and to</term>
-			<listitem>
-				<para>
-					Users can be cloned and each copy is assigned a number. This allows the creation of a range of users that can be put into various groups based on the range value.
-				</para>
-			</listitem>
-		</varlistentry>
+			<varlistentry>
+				<term>UserName</term>
+				<listitem>
+					<para>
+						The user&#39;s ID.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>Password</term>
+				<listitem>
+					<para>
+						The user&#39;s password.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>FirstName</term>
+				<listitem>
+					<para>
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>LastName</term>
+				<listitem>
+					<para>
+						last name.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>Email</term>
+				<listitem>
+					<para>
+						The user&#39;s email address.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>Groups</term>
+				<listitem>
+					<para>
+						A list of the groups that user belongs to.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>From and to</term>
+				<listitem>
+					<para>
+						Users can be cloned and each copy is assigned a number. This allows the creation of a range of users that can be put into various groups based on the range value.
+					</para>
+				</listitem>
+			</varlistentry>
 		</variablelist>
 	</section>
-	<section>
-	<title>Automatic Navigation Creation</title>
+	
+	<section id="sect-Reference_Guide-Data_Injector_Configuration-Automatic_Navigation_Creation">
+		<title>Automatic Navigation Creation</title>
 		<para>
-			The " <literal>auto.create.group.page.navigation</literal>" parameter value is <parameter>true</parameter> or <parameter>false</parameter>. If this value is set to <parameter>true</parameter> it automatically creates portal navigations and pages for each group. If <parameter>false</parameter> it does not.
+			The &#34; <literal>auto.create.group.page.navigation</literal>&#34; parameter value is <parameter>true</parameter> or <parameter>false</parameter>. If this value is set to <parameter>true</parameter> it automatically creates portal navigations and pages for each group. If <parameter>false</parameter> it does not.
 		</para>
 		<para>
-			The "<literal>auto.create.user.page.navigation</literal>" parameter value is the number of pages that are automatically created for each user.
+			The &#34;<literal>auto.create.user.page.navigation</literal>&#34; parameter value is the number of pages that are automatically created for each user.
 		</para>
 	</section>
 

Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Database_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Database_Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Database_Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Database_Configuration">
 	<title>Database Configuration</title>
@@ -21,73 +19,73 @@
 	<section id="sect-Reference_Guide-Database_Configuration-DB_and_datasource_configuration">
 		<title>DB and datasource configuration</title>
 		<para>
-			You can find the database configuration in the portal/WEB-INF/conf/database/database-configuration.xml file (located in your application server's web application directory).
+			You can find the database configuration in the portal/WEB-INF/conf/database/database-configuration.xml file (located in your application server&#39;s web application directory).
 		</para>
 		
-<programlisting role="XML">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
-&lt;configuration&gt;
+<programlisting role="XML">&#60;?xml version=&#34;1.0&#34; encoding=&#34;ISO-8859-1&#34;?&#62;
+&#60;configuration&#62;
   [...]
-  &lt;component&gt;
-    &lt;key&gt;org.exoplatform.services.database.HibernateService&lt;/key&gt;
-    &lt;jmx-name&gt;database:type=HibernateService&lt;/jmx-name&gt;
-    &lt;type&gt;org.exoplatform.services.database.impl.HibernateServiceImpl&lt;/type&gt;
-    &lt;init-params&gt;
-      &lt;properties-param&gt;
-        &lt;name&gt;hibernate.properties&lt;/name&gt;
-        &lt;description&gt;Default Hibernate Service&lt;/description&gt;
-        &lt;property name="hibernate.show_sql" value="false"/&gt;
-        &lt;property name="hibernate.cglib.use_reflection_optimizer" value="true"/&gt;
-        &lt;property name="hibernate.connection.url" value="jdbc:hsqldb:file:../temp/data/exodb"/&gt;
-        &lt;property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/&gt;
-        &lt;property name="hibernate.connection.autocommit" value="true"/&gt;
-        &lt;property name="hibernate.connection.username" value="sa"/&gt;
-        &lt;property name="hibernate.connection.password" value=""/&gt;
-        &lt;property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/&gt;
-        &lt;property name="hibernate.c3p0.min_size" value="5"/&gt;
-        &lt;property name="hibernate.c3p0.max_size" value="20"/&gt;
-        &lt;property name="hibernate.c3p0.timeout" value="1800"/&gt;
-        &lt;property name="hibernate.c3p0.max_statements" value="50"/&gt;
-      &lt;/properties-param&gt;
-    &lt;/init-params&gt;
-  &lt;/component&gt;
-  &lt;external-component-plugins&gt;
-    &lt;target-component&gt;org.exoplatform.services.naming.InitialContextInitializer&lt;/target-component&gt;
-    &lt;component-plugin&gt;
-      &lt;name&gt;bind.datasource&lt;/name&gt;
-      &lt;set-method&gt;addPlugin&lt;/set-method&gt;
-      &lt;type&gt;org.exoplatform.services.naming.BindReferencePlugin&lt;/type&gt;
-      &lt;init-params&gt;
-        &lt;value-param&gt;
-          &lt;name&gt;bind-name&lt;/name&gt;
-          &lt;value&gt;jdbcexo&lt;/value&gt;
-        &lt;/value-param&gt;
-        &lt;value-param&gt;
-          &lt;name&gt;class-name&lt;/name&gt;
-          &lt;value&gt;javax.sql.DataSource&lt;/value&gt;
-        &lt;/value-param&gt;
-        &lt;value-param&gt;
-          &lt;name&gt;factory&lt;/name&gt;
-          &lt;value&gt;org.apache.commons.dbcp.BasicDataSourceFactory&lt;/value&gt;
-        &lt;/value-param&gt;
-        &lt;properties-param&gt;
-          &lt;name&gt;ref-addresses&lt;/name&gt;
-          &lt;description&gt;ref-addresses&lt;/description&gt;
-          &lt;property name="driverClassName" value="org.hsqldb.jdbcDriver"/&gt;
-          &lt;property name="url" value="jdbc:hsqldb:file:../temp/data/exodb"/&gt;
-          &lt;property name="username" value="sa"/&gt;
-          &lt;property name="password" value=""/&gt;
-        &lt;/properties-param&gt;
-      &lt;/init-params&gt;
-    &lt;/component-plugin&gt;
-  &lt;/external-component-plugins&gt;
+  &#60;component&#62;
+    &#60;key&#62;org.exoplatform.services.database.HibernateService&#60;/key&#62;
+    &#60;jmx-name&#62;database:type=HibernateService&#60;/jmx-name&#62;
+    &#60;type&#62;org.exoplatform.services.database.impl.HibernateServiceImpl&#60;/type&#62;
+    &#60;init-params&#62;
+      &#60;properties-param&#62;
+        &#60;name&#62;hibernate.properties&#60;/name&#62;
+        &#60;description&#62;Default Hibernate Service&#60;/description&#62;
+        &#60;property name=&#34;hibernate.show_sql&#34; value=&#34;false&#34;/&#62;
+        &#60;property name=&#34;hibernate.cglib.use_reflection_optimizer&#34; value=&#34;true&#34;/&#62;
+        &#60;property name=&#34;hibernate.connection.url&#34; value=&#34;jdbc:hsqldb:file:../temp/data/exodb&#34;/&#62;
+        &#60;property name=&#34;hibernate.connection.driver_class&#34; value=&#34;org.hsqldb.jdbcDriver&#34;/&#62;
+        &#60;property name=&#34;hibernate.connection.autocommit&#34; value=&#34;true&#34;/&#62;
+        &#60;property name=&#34;hibernate.connection.username&#34; value=&#34;sa&#34;/&#62;
+        &#60;property name=&#34;hibernate.connection.password&#34; value=&#34;&#34;/&#62;
+        &#60;property name=&#34;hibernate.dialect&#34; value=&#34;org.hibernate.dialect.HSQLDialect&#34;/&#62;
+        &#60;property name=&#34;hibernate.c3p0.min_size&#34; value=&#34;5&#34;/&#62;
+        &#60;property name=&#34;hibernate.c3p0.max_size&#34; value=&#34;20&#34;/&#62;
+        &#60;property name=&#34;hibernate.c3p0.timeout&#34; value=&#34;1800&#34;/&#62;
+        &#60;property name=&#34;hibernate.c3p0.max_statements&#34; value=&#34;50&#34;/&#62;
+      &#60;/properties-param&#62;
+    &#60;/init-params&#62;
+  &#60;/component&#62;
+  &#60;external-component-plugins&#62;
+    &#60;target-component&#62;org.exoplatform.services.naming.InitialContextInitializer&#60;/target-component&#62;
+    &#60;component-plugin&#62;
+      &#60;name&#62;bind.datasource&#60;/name&#62;
+      &#60;set-method&#62;addPlugin&#60;/set-method&#62;
+      &#60;type&#62;org.exoplatform.services.naming.BindReferencePlugin&#60;/type&#62;
+      &#60;init-params&#62;
+        &#60;value-param&#62;
+          &#60;name&#62;bind-name&#60;/name&#62;
+          &#60;value&#62;jdbcexo&#60;/value&#62;
+        &#60;/value-param&#62;
+        &#60;value-param&#62;
+          &#60;name&#62;class-name&#60;/name&#62;
+          &#60;value&#62;javax.sql.DataSource&#60;/value&#62;
+        &#60;/value-param&#62;
+        &#60;value-param&#62;
+          &#60;name&#62;factory&#60;/name&#62;
+          &#60;value&#62;org.apache.commons.dbcp.BasicDataSourceFactory&#60;/value&#62;
+        &#60;/value-param&#62;
+        &#60;properties-param&#62;
+          &#60;name&#62;ref-addresses&#60;/name&#62;
+          &#60;description&#62;ref-addresses&#60;/description&#62;
+          &#60;property name=&#34;driverClassName&#34; value=&#34;org.hsqldb.jdbcDriver&#34;/&#62;
+          &#60;property name=&#34;url&#34; value=&#34;jdbc:hsqldb:file:../temp/data/exodb&#34;/&#62;
+          &#60;property name=&#34;username&#34; value=&#34;sa&#34;/&#62;
+          &#60;property name=&#34;password&#34; value=&#34;&#34;/&#62;
+        &#60;/properties-param&#62;
+      &#60;/init-params&#62;
+    &#60;/component-plugin&#62;
+  &#60;/external-component-plugins&#62;
   [...]
-&lt;/configuration&gt;
+&#60;/configuration&#62;
 </programlisting>
 		<para>
-			The first component configuration is for the Hibernate service. You can enter any additional properties in a <literal>hibernate.properties</literal> file, but &PRODUCT; will override <literal>hibernate.properties</literal>  with values read in from this configuration file.
+			The first component configuration is for the Hibernate service. You can enter any additional properties in a <literal>hibernate.properties</literal> file, but &PRODUCT; will override <literal>hibernate.properties</literal> with values read in from this configuration file.
 		</para>
 		<para>
-			The second component configuration is for the JCR datasource. The <literal>InitialContextInitializer</literal> component will load the factory class, use the factory object to create a datasource, and bind that datasource in the JNDI tree with the value of the "bind-name" parameter. If you want to change the bind-name, for example "<parameter>jdbcexo</parameter>" to "<parameter>myjdbc</parameter>", you also need to change JCR repository configuration in order that the service picks up the right datasource.
+			The second component configuration is for the JCR datasource. The <literal>InitialContextInitializer</literal> component will load the factory class, use the factory object to create a datasource, and bind that datasource in the JNDI tree with the value of the &#34;bind-name&#34; parameter. If you want to change the bind-name, for example &#34;<parameter>jdbcexo</parameter>&#34; to &#34;<parameter>myjdbc</parameter>&#34;, you also need to change JCR repository configuration in order that the service picks up the right datasource.
 		</para>
 		<para>
 			Make sure you update the database connection properties and dialect for both of these component configurations.
@@ -104,24 +102,24 @@
 		</para>
 		
 <programlisting>[...]
- &lt;component&gt;
-   &lt;key&gt;org.exoplatform.services.jcr.config.RepositoryServiceConfiguration&lt;/key&gt;
-   &lt;type&gt;org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl&lt;/type&gt;
-   &lt;init-params&gt;
-     &lt;value-param&gt;
-       &lt;name&gt;conf-path&lt;/name&gt;
-       &lt;description&gt;JCR configuration file&lt;/description&gt;
-       &lt;value&gt;war:/conf/jcr/repository-configuration.xml&lt;/value&gt;
-     &lt;/value-param&gt;
-     &lt;properties-param&gt;
-       &lt;name&gt;working-conf&lt;/name&gt;
-       &lt;description&gt;working-conf&lt;/description&gt;
-       &lt;property name="persisterClassName" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/&gt;
-       &lt;property name="sourceName" value="jdbcexo"/&gt;
-       &lt;property name="dialect" value="hsqldb"/&gt;
-     &lt;/properties-param&gt;
-   &lt;/init-params&gt;
- &lt;/component&gt;
+ &#60;component&#62;
+   &#60;key&#62;org.exoplatform.services.jcr.config.RepositoryServiceConfiguration&#60;/key&#62;
+   &#60;type&#62;org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl&#60;/type&#62;
+   &#60;init-params&#62;
+     &#60;value-param&#62;
+       &#60;name&#62;conf-path&#60;/name&#62;
+       &#60;description&#62;JCR configuration file&#60;/description&#62;
+       &#60;value&#62;war:/conf/jcr/repository-configuration.xml&#60;/value&#62;
+     &#60;/value-param&#62;
+     &#60;properties-param&#62;
+       &#60;name&#62;working-conf&#60;/name&#62;
+       &#60;description&#62;working-conf&#60;/description&#62;
+       &#60;property name=&#34;persisterClassName&#34; value=&#34;org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister&#34;/&#62;
+       &#60;property name=&#34;sourceName&#34; value=&#34;jdbcexo&#34;/&#62;
+       &#60;property name=&#34;dialect&#34; value=&#34;hsqldb&#34;/&#62;
+     &#60;/properties-param&#62;
+   &#60;/init-params&#62;
+ &#60;/component&#62;
 [...]
 </programlisting>
 		<para>
@@ -129,52 +127,52 @@
 		</para>
 		
 <programlisting role="XML"> ...]     
-     &lt;workspaces&gt;
-       &lt;workspace name="system" auto-init-root-nodetype="nt:unstructured" 
-                  auto-init-permissions="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" &gt;
-          &lt;!-- for system storage --&gt;
-          &lt;container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"&gt;
-            &lt;properties&gt;
-              &lt;property name="sourceName" value="jdbcexo"/&gt;
-              &lt;property name="dialect" value="hsql"/&gt;
-              &lt;!-- property name="db-type" value="mysql"/ --&gt;
-              &lt;property name="multi-db" value="false"/&gt;
-              &lt;property name="update-storage" value="true"/&gt;
-              &lt;property name="max-buffer-size" value="204800"/&gt;
-              &lt;property name="swap-directory" value="../temp/swap/system"/&gt;
-            &lt;/properties&gt;
+     &#60;workspaces&#62;
+       &#60;workspace name=&#34;system&#34; auto-init-root-nodetype=&#34;nt:unstructured&#34; 
+                  auto-init-permissions=&#34;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove&#34; &#62;
+          &#60;!-- for system storage --&#62;
+          &#60;container class=&#34;org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer&#34;&#62;
+            &#60;properties&#62;
+              &#60;property name=&#34;sourceName&#34; value=&#34;jdbcexo&#34;/&#62;
+              &#60;property name=&#34;dialect&#34; value=&#34;hsql&#34;/&#62;
+              &#60;!-- property name=&#34;db-type&#34; value=&#34;mysql&#34;/ --&#62;
+              &#60;property name=&#34;multi-db&#34; value=&#34;false&#34;/&#62;
+              &#60;property name=&#34;update-storage&#34; value=&#34;true&#34;/&#62;
+              &#60;property name=&#34;max-buffer-size&#34; value=&#34;204800&#34;/&#62;
+              &#60;property name=&#34;swap-directory&#34; value=&#34;../temp/swap/system&#34;/&#62;
+            &#60;/properties&#62;
 [...]
-       &lt;/workspace&gt;
-       &lt;workspace name="collaboration" auto-init-root-nodetype="nt:unstructured" 
-                  auto-init-permissions="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" &gt;
-          &lt;!-- for system storage --&gt;
-          &lt;container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"&gt;
-            &lt;properties&gt;
-              &lt;property name="sourceName" value="jdbcexo"/&gt;
-              &lt;property name="dialect" value="hsqldb"/&gt;
-              &lt;property name="multi-db" value="false"/&gt;
-              &lt;property name="update-storage" value="true"/&gt;
-              &lt;property name="max-buffer-size" value="204800"/&gt;
-              &lt;property name="swap-directory" value="../temp/swap/collaboration"/&gt;
-            &lt;/properties&gt;
+       &#60;/workspace&#62;
+       &#60;workspace name=&#34;collaboration&#34; auto-init-root-nodetype=&#34;nt:unstructured&#34; 
+                  auto-init-permissions=&#34;any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove&#34; &#62;
+          &#60;!-- for system storage --&#62;
+          &#60;container class=&#34;org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer&#34;&#62;
+            &#60;properties&#62;
+              &#60;property name=&#34;sourceName&#34; value=&#34;jdbcexo&#34;/&#62;
+              &#60;property name=&#34;dialect&#34; value=&#34;hsqldb&#34;/&#62;
+              &#60;property name=&#34;multi-db&#34; value=&#34;false&#34;/&#62;
+              &#60;property name=&#34;update-storage&#34; value=&#34;true&#34;/&#62;
+              &#60;property name=&#34;max-buffer-size&#34; value=&#34;204800&#34;/&#62;
+              &#60;property name=&#34;swap-directory&#34; value=&#34;../temp/swap/collaboration&#34;/&#62;
+            &#60;/properties&#62;
 [...]
-       &lt;/workspace&gt;
-       &lt;workspace name="backup" auto-init-root-nodetype="nt:unstructured" 
-                  auto-init-permissions="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" &gt;
-          &lt;!-- for system storage --&gt;
-          &lt;container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"&gt;
-            &lt;properties&gt;
-              &lt;property name="sourceName" value="jdbcexo"/&gt;
-              &lt;property name="dialect" value="mysql"/&gt;
-              &lt;!-- property name="db-type" value="mysql"/ --&gt;
-              &lt;property name="multi-db" value="false"/&gt;
-              &lt;property name="update-storage" value="true"/&gt;
-              &lt;property name="max-buffer-size" value="204800"/&gt;
-              &lt;property name="swap-directory" value="../temp/swap/backup"/&gt;
-            &lt;/properties&gt;
-       &lt;/workspace&gt;
+       &#60;/workspace&#62;
+       &#60;workspace name=&#34;backup&#34; auto-init-root-nodetype=&#34;nt:unstructured&#34; 
+                  auto-init-permissions=&#34;any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove&#34; &#62;
+          &#60;!-- for system storage --&#62;
+          &#60;container class=&#34;org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer&#34;&#62;
+            &#60;properties&#62;
+              &#60;property name=&#34;sourceName&#34; value=&#34;jdbcexo&#34;/&#62;
+              &#60;property name=&#34;dialect&#34; value=&#34;mysql&#34;/&#62;
+              &#60;!-- property name=&#34;db-type&#34; value=&#34;mysql&#34;/ --&#62;
+              &#60;property name=&#34;multi-db&#34; value=&#34;false&#34;/&#62;
+              &#60;property name=&#34;update-storage&#34; value=&#34;true&#34;/&#62;
+              &#60;property name=&#34;max-buffer-size&#34; value=&#34;204800&#34;/&#62;
+              &#60;property name=&#34;swap-directory&#34; value=&#34;../temp/swap/backup&#34;/&#62;
+            &#60;/properties&#62;
+       &#60;/workspace&#62;
 [...]
-      &lt;/workspaces&gt;
+      &#60;/workspaces&#62;
 [...]
 </programlisting>
 	</section>

Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Default_Portal_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Default_Portal_Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Default_Portal_Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,43 +1,41 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Default_Portal_Configuration">
 	<title>Default Portal Configuration</title>
 	<section id="sect-Reference_Guide-Default_Portal_Configuration-Overview">
 		<title>Overview</title>
 		<para>
-			The default portal will be accessed if the user doesn't specify another portal. For example: <literal>http://hostname:port/portal/</literal>. The default portal also be used at startup to determine if the tomcat database is empty or not.
+			The default portal will be accessed if the user doesn&#39;t specify another portal. For example: <literal>http://hostname:port/portal/</literal>. The default portal also be used at startup to determine if the tomcat database is empty or not.
 		</para>
 	</section>
 	
 	<section id="sect-Reference_Guide-Default_Portal_Configuration-Configuration">
 		<title>Configuration</title>
 		<para>
-			The example configuration file below is found at: "<filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename>".
+			The example configuration file below is found at: &#34;<filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename>&#34;.
 		</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 role="XML">&#60;component&#62;
+    &#60;key&#62;org.exoplatform.portal.config.UserPortalConfigService&#60;/key&#62;
+    &#60;type&#62;org.exoplatform.portal.config.UserPortalConfigService&#60;/type&#62;
+    &#60;component-plugins&#62;           
+     &#60;component-plugin&#62;
+       &#60;name&#62;new.portal.config.user.listener&#60;/name&#62;
+       &#60;set-method&#62;initListener&#60;/set-method&#62;
+       &#60;type&#62;org.exoplatform.portal.config.NewPortalConfigListener&#60;/type&#62;
+       &#60;description&#62;this listener init the portal configuration&#60;/description&#62;
+       &#60;init-params&#62;
+         &#60;value-param&#62;
+           &#60;name&#62;default.portal&#60;/name&#62;
+           &#60;description&#62;The default portal for checking db is empty or not&#60;/description&#62;
+           &#60;value&#62;classic&#60;/value&#62;
+         &#60;/value-param&#62; 
          ..........
-       &lt;/init-params&gt;
-     &lt;/component-plugin&gt;
-    &lt;/component-plugins&gt; 
-  &lt;/component&gt;
+       &#60;/init-params&#62;
+     &#60;/component-plugin&#62;
+    &#60;/component-plugins&#62; 
+  &#60;/component&#62;
 </programlisting>
 		<para>
 			In this example the <emphasis role="bold">classic</emphasis> portal has been set as the default. Note that the definition should be as a initial parameter of the NewPortalConfigListener component-plugin.

Modified: portal/trunk/docs/reference-guide/en/modules/configuration/IDM_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/IDM_Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/IDM_Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-PicketLink_IDM_integration">
 	<title>PicketLink IDM integration</title>
@@ -9,7 +7,7 @@
 		&PRODUCT; uses the PicketLink IDM component to retain necessary identity information (user, groups, memberships, etc.). While legacy interfaces are still used (org.exoplatform.services.organization) for identity management, the wrapper implementation delegates to the PicketLink IDM framework.
 	</para>
 	<para>
-		This section doesn't provide information about PicketLink IDM and its configuration. Please refer to the appropriate project documentation (<ulink url="http://jboss.org/picketlink/IDM.html" />) for further information.
+		This section doesn&#39;t provide information about PicketLink IDM and its configuration. Please refer to the appropriate project documentation (<ulink url="http://jboss.org/picketlink/IDM.html" />) for further information.
 	</para>
 	<note>
 		<para>
@@ -17,8 +15,8 @@
 		</para>
 	</note>
 	<para>
-		The identity model represented in '<emphasis role="bold">org.exoplatform.services.organization</emphasis>' interfaces and the one used in <emphasis role="bold">JBoss Identity IDM</emphasis> have some major differences.
-	</para>	
+		The identity model represented in &#39;<emphasis role="bold">org.exoplatform.services.organization</emphasis>&#39; interfaces and the one used in <emphasis role="bold">JBoss Identity IDM</emphasis> have some major differences.
+	</para>
 	<para>
 		For example: the <emphasis role="bold">JBoss Identity IDM</emphasis> provides greater abstraction. It is possible for groups in the <emphasis role="bold">IDM</emphasis> framework to form memberships with many parents (which requires recursive ID translation) while the GateIn model allows only pure tree like membership structures.
 	</para>
@@ -32,79 +30,77 @@
 		</para>
 		<programlistingco>
 			<areaspec>
-				<area coords="7" id="area-Reference_Guide--PicketLink_IDM_integration-Configuration_files-JBossIDMServiceImpl" />
-				<area coords="52" id="area-Reference_Guide--PicketLink_IDM_integration-Configuration_files-JBossIDMOrganizationServiceImpl" />
+				<area coords="7" id="area-Reference_Guide-PicketLink_IDM_integration-Configuration_files-JBossIDMServiceImpl" />
+				<area coords="52" id="area-Reference_Guide-PicketLink_IDM_integration-Configuration_files-JBossIDMOrganizationServiceImpl" />
 			</areaspec>
+			
+<programlisting role="XML">&#60;configuration xmlns:xsi=&#34;http://www.w3.org/2001/XMLSchema-instance&#34;
+               xsi:schemaLocation=&#34;http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd&#34;
+               xmlns=&#34;http://www.exoplaform.org/xml/ns/kernel_1_0.xsd&#34;&#62;
 
-<programlisting role="XML">&lt;configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
-               xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"&gt;
+   &#60;component&#62;
+      &#60;key&#62;org.exoplatform.services.organization.jbidm.JBossIDMService&#60;/key&#62;
+      &#60;type&#62;org.exoplatform.services.organization.jbidm.JBossIDMServiceImpl&#60;/type&#62;
+      &#60;init-params&#62;
+         &#60;value-param&#62;
+            &#60;name&#62;config&#60;/name&#62;
+            &#60;value&#62;war:/conf/organization/idm-config.xml&#60;/value&#62;
+         &#60;/value-param&#62;
+         &#60;values-param&#62;
+            &#60;name&#62;hibernate.annotations&#60;/name&#62;
+            &#60;value&#62;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject&#60;/value&#62;
+            &#60;value&#62;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute&#60;/value&#62;
+            &#60;value&#62;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute&#60;/value&#62;
+            &#60;value&#62;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue&#60;/value&#62;
+            &#60;value&#62;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential&#60;/value&#62;
+            &#60;value&#62;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType&#60;/value&#62;
+            &#60;value&#62;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship&#60;/value&#62;
+            &#60;value&#62;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName&#60;/value&#62;
+            &#60;value&#62;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType&#60;/value&#62;
+            &#60;value&#62;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute&#60;/value&#62;
+            &#60;value&#62;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType&#60;/value&#62;
+            &#60;value&#62;org.jboss.identity.idm.impl.model.hibernate.HibernateRealm&#60;/value&#62;
+         &#60;/values-param&#62;
+         &#60;properties-param&#62;
+            &#60;name&#62;hibernate.properties&#60;/name&#62;
+            &#60;property name=&#34;hibernate.hbm2ddl.auto&#34; value=&#34;update&#34;/&#62;
+            &#60;property name=&#34;hibernate.current_session_context_class&#34; value=&#34;thread&#34;/&#62;
+            &#60;property name=&#34;hibernate.show_sql&#34; value=&#34;false&#34;/&#62;
+            &#60;property name=&#34;hibernate.cglib.use_reflection_optimizer&#34; value=&#34;true&#34;/&#62;
+            &#60;property name=&#34;hibernate.connection.url&#34; value=&#34;jdbc:hsqldb:file:../temp/data/exodb${container.name.suffix}&#34;/&#62;
+            &#60;property name=&#34;hibernate.connection.driver_class&#34; value=&#34;org.hsqldb.jdbcDriver&#34;/&#62;
+            &#60;property name=&#34;hibernate.connection.autocommit&#34; value=&#34;true&#34;/&#62;
+            &#60;property name=&#34;hibernate.connection.username&#34; value=&#34;sa&#34;/&#62;
+            &#60;property name=&#34;hibernate.connection.password&#34; value=&#34;&#34;/&#62;
+            &#60;property name=&#34;hibernate.dialect&#34; value=&#34;org.hibernate.dialect.HSQLDialect&#34;/&#62;
+            &#60;property name=&#34;hibernate.c3p0.min_size&#34; value=&#34;5&#34;/&#62;
+            &#60;property name=&#34;hibernate.c3p0.max_size&#34; value=&#34;20&#34;/&#62;
+            &#60;property name=&#34;hibernate.c3p0.timeout&#34; value=&#34;1800&#34;/&#62;
+            &#60;property name=&#34;hibernate.c3p0.max_statements&#34; value=&#34;50&#34;/&#62;
+            &#60;property name=&#34;hibernate.connection.provider_class&#34; value=&#34;org.hibernate.connection.C3P0ConnectionProvider&#34; /&#62;
+         &#60;/properties-param&#62;
 
-   &lt;component&gt;
-      &lt;key&gt;org.exoplatform.services.organization.jbidm.JBossIDMService&lt;/key&gt;
-      &lt;type&gt;org.exoplatform.services.organization.jbidm.JBossIDMServiceImpl&lt;/type&gt;
-      &lt;init-params&gt;
-         &lt;value-param&gt;
-            &lt;name&gt;config&lt;/name&gt;
-            &lt;value&gt;war:/conf/organization/idm-config.xml&lt;/value&gt;
-         &lt;/value-param&gt;
-         &lt;values-param&gt;
-            &lt;name&gt;hibernate.annotations&lt;/name&gt;
-            &lt;value&gt;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject&lt;/value&gt;
-            &lt;value&gt;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute&lt;/value&gt;
-            &lt;value&gt;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute&lt;/value&gt;
-            &lt;value&gt;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue&lt;/value&gt;
-            &lt;value&gt;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential&lt;/value&gt;
-            &lt;value&gt;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType&lt;/value&gt;
-            &lt;value&gt;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship&lt;/value&gt;
-            &lt;value&gt;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName&lt;/value&gt;
-            &lt;value&gt;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType&lt;/value&gt;
-            &lt;value&gt;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute&lt;/value&gt;
-            &lt;value&gt;org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType&lt;/value&gt;
-            &lt;value&gt;org.jboss.identity.idm.impl.model.hibernate.HibernateRealm&lt;/value&gt;
-         &lt;/values-param&gt;
-         &lt;properties-param&gt;
-            &lt;name&gt;hibernate.properties&lt;/name&gt;
-            &lt;property name="hibernate.hbm2ddl.auto" value="update"/&gt;
-            &lt;property name="hibernate.current_session_context_class" value="thread"/&gt;
-            &lt;property name="hibernate.show_sql" value="false"/&gt;
-            &lt;property name="hibernate.cglib.use_reflection_optimizer" value="true"/&gt;
-            &lt;property name="hibernate.connection.url" value="jdbc:hsqldb:file:../temp/data/exodb${container.name.suffix}"/&gt;
-            &lt;property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/&gt;
-            &lt;property name="hibernate.connection.autocommit" value="true"/&gt;
-            &lt;property name="hibernate.connection.username" value="sa"/&gt;
-            &lt;property name="hibernate.connection.password" value=""/&gt;
-            &lt;property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/&gt;
-            &lt;property name="hibernate.c3p0.min_size" value="5"/&gt;
-            &lt;property name="hibernate.c3p0.max_size" value="20"/&gt;
-            &lt;property name="hibernate.c3p0.timeout" value="1800"/&gt;
-            &lt;property name="hibernate.c3p0.max_statements" value="50"/&gt;
-            &lt;property name="hibernate.connection.provider_class" value="org.hibernate.connection.C3P0ConnectionProvider" /&gt;
-         &lt;/properties-param&gt;
+      &#60;/init-params&#62;
+   &#60;/component&#62;
 
-      &lt;/init-params&gt;
-   &lt;/component&gt;
+   &#60;component&#62;
+      &#60;key&#62;org.exoplatform.services.organization.OrganizationService&#60;/key&#62;
+      &#60;type&#62;org.exoplatform.services.organization.jbidm.JBossIDMOrganizationServiceImpl&#60;/type&#62;
+   &#60;/component&#62;
 
-   &lt;component&gt;
-      &lt;key&gt;org.exoplatform.services.organization.OrganizationService&lt;/key&gt;
-      &lt;type&gt;org.exoplatform.services.organization.jbidm.JBossIDMOrganizationServiceImpl&lt;/type&gt;
-   &lt;/component&gt;
-
-&lt;/configuration&gt;
+&#60;/configuration&#62;
 </programlisting>
 			<calloutlist>
-				<callout arearefs="area-Reference_Guide--PicketLink_IDM_integration-Configuration_files-JBossIDMServiceImpl">
+				<callout arearefs="area-Reference_Guide-PicketLink_IDM_integration-Configuration_files-JBossIDMServiceImpl">
 					<para>
 						The <emphasis role="bold">org.exoplatform.services.organization.jbidm.JBossIDMServiceImpl</emphasis> service has following options:
 					</para>
-
-
-<!-- Included in calloutlist <para>
+					<!--  Included in calloutlist <para>
 			The <emphasis role="bold">org.exoplatform.services.organization.jbidm.JBossIDMOrganizationServiceImpl</emphasis> is a main entrypoint implementing <emphasis role="bold">org.exoplatform.services.organization.OrganizationService</emphasis> and is dependant on <emphasis role="bold">org.exoplatform.services.organization.jbidm.JBossIDMService</emphasis>
 		</para> 
 		<para>
 			The <emphasis role="bold">org.exoplatform.services.organization.jbidm.JBossIDMServiceImpl</emphasis> service has following options:
-		</para> -->
+		</para>  -->
 					<itemizedlist>
 						<listitem>
 							<para>
@@ -128,17 +124,17 @@
 						</listitem>
 						<listitem>
 							<para>
-								<emphasis role="bold">jndiName</emphasis> - (value-param) - in case 'config' parameter is not provided this will be used to perform JNDI lookup for IdentitySessionFactory
+								<emphasis role="bold">jndiName</emphasis> - (value-param) - in case &#39;config&#39; parameter is not provided this will be used to perform JNDI lookup for IdentitySessionFactory
 							</para>
 						</listitem>
 						<listitem>
 							<para>
-								<emphasis role="bold">PortalRealm</emphasis> - (value-param) - name of a realm that should be used to obtain proper IdentitySession - default is 'PortalRealm'.
+								<emphasis role="bold">PortalRealm</emphasis> - (value-param) - name of a realm that should be used to obtain proper IdentitySession - default is &#39;PortalRealm&#39;.
 							</para>
 						</listitem>
 					</itemizedlist>
 				</callout>
-				<callout arearefs="area-Reference_Guide--PicketLink_IDM_integration-Configuration_files-JBossIDMOrganizationServiceImpl">
+				<callout arearefs="area-Reference_Guide-PicketLink_IDM_integration-Configuration_files-JBossIDMOrganizationServiceImpl">
 					<para>
 						The <emphasis role="bold">org.exoplatform.services.organization.jbidm.JBossIDMOrganizationServiceImpl</emphasis> key is a main entrypoint implementing <emphasis role="bold">org.exoplatform.services.organization.OrganizationService</emphasis> and is dependant on <emphasis role="bold">org.exoplatform.services.organization.jbidm.JBossIDMService</emphasis>
 					</para>
@@ -148,17 +144,17 @@
 					<itemizedlist>
 						<listitem>
 							<para>
-								<emphasis role="bold">exoGroupTypeName</emphasis> - (value-param) - Name of JBoss Identity IDM GroupType that will be used to store groups. Default is 'EXO_GROUP_TYPE'
+								<emphasis role="bold">exoGroupTypeName</emphasis> - (value-param) - Name of JBoss Identity IDM GroupType that will be used to store groups. Default is &#39;EXO_GROUP_TYPE&#39;
 							</para>
 						</listitem>
 						<listitem>
 							<para>
-								<emphasis role="bold">exoRootGroupName</emphasis> - (value-param) - Name of JBoss Identity IDM Group that will be used as a root parent. Default is 'EXO_ROOT_GROUP'
+								<emphasis role="bold">exoRootGroupName</emphasis> - (value-param) - Name of JBoss Identity IDM Group that will be used as a root parent. Default is &#39;EXO_ROOT_GROUP&#39;
 							</para>
 						</listitem>
 						<listitem>
 							<para>
-								<emphasis role="bold">exoRootGroupTypeName</emphasis> - (value-param) - Name of JBoss Identity IDM GroupType of a Group used as a parent root. Default is 'EXO_GROUP_TYPE'
+								<emphasis role="bold">exoRootGroupTypeName</emphasis> - (value-param) - Name of JBoss Identity IDM GroupType of a Group used as a parent root. Default is &#39;EXO_GROUP_TYPE&#39;
 							</para>
 						</listitem>
 						<listitem>
@@ -189,9 +185,9 @@
 					</itemizedlist>
 				</callout>
 			</calloutlist>
-	</programlistingco>
-
-<!--	In calloutlist above	<para>
+		</programlistingco>
+		
+		<!-- 	In calloutlist above	<para>
 			<emphasis role="bold">org.exoplatform.services.organization.jbidm.JBossIDMOrganizationServiceImpl</emphasis> service has following options:
 		</para>
 		<itemizedlist>
@@ -235,85 +231,84 @@
 					GateIn MembershipType interface properties fields are persisted in JBoss Identity IDM using those RoleType properties: description, owner, create_date, modified_date
 				</para>
 			</listitem>
-		</itemizedlist> -->
-
+		</itemizedlist>  -->
 		<para>
 			A sample <emphasis role="bold">JBoss Identity IDM</emphasis> configuration file is shown below. To understand all the options present in it please refer to the JBoss Identity IDM Reference Guide
 		</para>
 		
-<programlisting>&lt;jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"&gt;
-    &lt;realms&gt;
-        &lt;realm&gt;
-            &lt;id&gt;PortalRealm&lt;/id&gt;
-            &lt;repository-id-ref&gt;PortalRepository&lt;/repository-id-ref&gt;
-            &lt;identity-type-mappings&gt;
-                &lt;user-mapping&gt;USER&lt;/user-mapping&gt;
-            &lt;/identity-type-mappings&gt;
-        &lt;/realm&gt;
-    &lt;/realms&gt;
-    &lt;repositories&gt;
-        &lt;repository&gt;
-            &lt;id&gt;PortalRepository&lt;/id&gt;
-            &lt;class&gt;org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository&lt;/class&gt;
-            &lt;external-config/&gt;
-            &lt;default-identity-store-id&gt;HibernateStore&lt;/default-identity-store-id&gt;
-            &lt;default-attribute-store-id&gt;HibernateStore&lt;/default-attribute-store-id&gt;
-        &lt;/repository&gt;
-    &lt;/repositories&gt;
-    &lt;stores&gt;
-        &lt;attribute-stores/&gt;
-        &lt;identity-stores&gt;
-            &lt;identity-store&gt;
-                &lt;id&gt;HibernateStore&lt;/id&gt;
-                &lt;class&gt;org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl&lt;/class&gt;
-                &lt;external-config/&gt;
-                &lt;supported-relationship-types&gt;
-                    &lt;relationship-type&gt;JBOSS_IDENTITY_MEMBERSHIP&lt;/relationship-type&gt;
-                    &lt;relationship-type&gt;JBOSS_IDENTITY_ROLE&lt;/relationship-type&gt;
-                &lt;/supported-relationship-types&gt;
-                &lt;supported-identity-object-types&gt;
-                    &lt;identity-object-type&gt;
-                        &lt;name&gt;USER&lt;/name&gt;
-                        &lt;relationships/&gt;
-                        &lt;credentials&gt;
-                            &lt;credential-type&gt;PASSWORD&lt;/credential-type&gt;
-                        &lt;/credentials&gt;
-                        &lt;attributes/&gt;
-                        &lt;options/&gt;
-                    &lt;/identity-object-type&gt;
-                &lt;/supported-identity-object-types&gt;
-                &lt;options&gt;
-                    &lt;option&gt;
-                        &lt;name&gt;hibernateSessionFactoryRegistryName&lt;/name&gt;
-                        &lt;value&gt;hibernateSessionFactory&lt;/value&gt;
-                    &lt;/option&gt;
-                    &lt;option&gt;
-                        &lt;name&gt;allowNotDefinedIdentityObjectTypes&lt;/name&gt;
-                        &lt;value&gt;true&lt;/value&gt;
-                    &lt;/option&gt;
-                    &lt;option&gt;
-                        &lt;name&gt;populateRelationshipTypes&lt;/name&gt;
-                        &lt;value&gt;true&lt;/value&gt;
-                    &lt;/option&gt;
-                    &lt;option&gt;
-                        &lt;name&gt;populateIdentityObjectTypes&lt;/name&gt;
-                        &lt;value&gt;true&lt;/value&gt;
-                    &lt;/option&gt;
-                    &lt;option&gt;
-                        &lt;name&gt;allowNotDefinedAttributes&lt;/name&gt;
-                        &lt;value&gt;true&lt;/value&gt;
-                    &lt;/option&gt;
-                    &lt;option&gt;
-                        &lt;name&gt;isRealmAware&lt;/name&gt;
-                        &lt;value&gt;true&lt;/value&gt;
-                    &lt;/option&gt;
-                &lt;/options&gt;
-            &lt;/identity-store&gt;
-        &lt;/identity-stores&gt;
-    &lt;/stores&gt;
-&lt;/jboss-identity&gt;
+<programlisting>&#60;jboss-identity xmlns=&#34;urn:jboss:identity:idm:config:v1_0_beta&#34;
+                xmlns:xsi=&#34;http://www.w3.org/2001/XMLSchema-instance&#34;
+                xsi:schemaLocation=&#34;urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd&#34;&#62;
+    &#60;realms&#62;
+        &#60;realm&#62;
+            &#60;id&#62;PortalRealm&#60;/id&#62;
+            &#60;repository-id-ref&#62;PortalRepository&#60;/repository-id-ref&#62;
+            &#60;identity-type-mappings&#62;
+                &#60;user-mapping&#62;USER&#60;/user-mapping&#62;
+            &#60;/identity-type-mappings&#62;
+        &#60;/realm&#62;
+    &#60;/realms&#62;
+    &#60;repositories&#62;
+        &#60;repository&#62;
+            &#60;id&#62;PortalRepository&#60;/id&#62;
+            &#60;class&#62;org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository&#60;/class&#62;
+            &#60;external-config/&#62;
+            &#60;default-identity-store-id&#62;HibernateStore&#60;/default-identity-store-id&#62;
+            &#60;default-attribute-store-id&#62;HibernateStore&#60;/default-attribute-store-id&#62;
+        &#60;/repository&#62;
+    &#60;/repositories&#62;
+    &#60;stores&#62;
+        &#60;attribute-stores/&#62;
+        &#60;identity-stores&#62;
+            &#60;identity-store&#62;
+                &#60;id&#62;HibernateStore&#60;/id&#62;
+                &#60;class&#62;org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl&#60;/class&#62;
+                &#60;external-config/&#62;
+                &#60;supported-relationship-types&#62;
+                    &#60;relationship-type&#62;JBOSS_IDENTITY_MEMBERSHIP&#60;/relationship-type&#62;
+                    &#60;relationship-type&#62;JBOSS_IDENTITY_ROLE&#60;/relationship-type&#62;
+                &#60;/supported-relationship-types&#62;
+                &#60;supported-identity-object-types&#62;
+                    &#60;identity-object-type&#62;
+                        &#60;name&#62;USER&#60;/name&#62;
+                        &#60;relationships/&#62;
+                        &#60;credentials&#62;
+                            &#60;credential-type&#62;PASSWORD&#60;/credential-type&#62;
+                        &#60;/credentials&#62;
+                        &#60;attributes/&#62;
+                        &#60;options/&#62;
+                    &#60;/identity-object-type&#62;
+                &#60;/supported-identity-object-types&#62;
+                &#60;options&#62;
+                    &#60;option&#62;
+                        &#60;name&#62;hibernateSessionFactoryRegistryName&#60;/name&#62;
+                        &#60;value&#62;hibernateSessionFactory&#60;/value&#62;
+                    &#60;/option&#62;
+                    &#60;option&#62;
+                        &#60;name&#62;allowNotDefinedIdentityObjectTypes&#60;/name&#62;
+                        &#60;value&#62;true&#60;/value&#62;
+                    &#60;/option&#62;
+                    &#60;option&#62;
+                        &#60;name&#62;populateRelationshipTypes&#60;/name&#62;
+                        &#60;value&#62;true&#60;/value&#62;
+                    &#60;/option&#62;
+                    &#60;option&#62;
+                        &#60;name&#62;populateIdentityObjectTypes&#60;/name&#62;
+                        &#60;value&#62;true&#60;/value&#62;
+                    &#60;/option&#62;
+                    &#60;option&#62;
+                        &#60;name&#62;allowNotDefinedAttributes&#60;/name&#62;
+                        &#60;value&#62;true&#60;/value&#62;
+                    &#60;/option&#62;
+                    &#60;option&#62;
+                        &#60;name&#62;isRealmAware&#60;/name&#62;
+                        &#60;value&#62;true&#60;/value&#62;
+                    &#60;/option&#62;
+                &#60;/options&#62;
+            &#60;/identity-store&#62;
+        &#60;/identity-stores&#62;
+    &#60;/stores&#62;
+&#60;/jboss-identity&#62;
 </programlisting>
 	</section>
 

Modified: portal/trunk/docs/reference-guide/en/modules/configuration/JavaScript_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/JavaScript_Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/JavaScript_Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Javascript_Configuration">
 	<title>Javascript Configuration</title>
@@ -10,77 +8,77 @@
 	</para>
 	<para>
 		Every portlet can have its own javscript code but in many cases it is more convenient to reuse some existing shared libraries. For that reason, &PRODUCT; has a mechanism to easily register the libraries that will be loaded when the first page will be rendered.
-	</para>	
+	</para>
 	<para>
-		To do so, every WAR deployed in &PRODUCT; can register the <filename>js</filename> files with the groovy script "<filename>WEB-INF/conf/script/groovy/JavascriptScript.groovy</filename>". 
+		To do so, every WAR deployed in &PRODUCT; can register the <filename>js</filename> files with the groovy script &#34;<filename>WEB-INF/conf/script/groovy/JavascriptScript.groovy</filename>&#34;.
 	</para>
 	<para>
 		The example file below is found in the 01eXoResources.war
 	</para>
 	
-<programlisting>JavascriptService.addJavascript("eXo", "/javascript/eXo.js", ServletContext);
+<programlisting>JavascriptService.addJavascript(&#34;eXo&#34;, &#34;/javascript/eXo.js&#34;, ServletContext);
 /* Animation Javascripts */
-JavascriptService.addJavascript("eXo.animation.ImplodeExplode", "/javascript/eXo/animation/ImplodeExplode.js", ServletContext);
+JavascriptService.addJavascript(&#34;eXo.animation.ImplodeExplode&#34;, &#34;/javascript/eXo/animation/ImplodeExplode.js&#34;, ServletContext);
 /* Application descriptor */
-JavascriptService.addJavascript("eXo.application.ApplicationDescriptor", "/javascript/eXo/application/ApplicationDescriptor.js", ServletContext);
+JavascriptService.addJavascript(&#34;eXo.application.ApplicationDescriptor&#34;, &#34;/javascript/eXo/application/ApplicationDescriptor.js&#34;, ServletContext);
 /* CORE Javascripts */
-JavascriptService.addJavascript("eXo.core.Utils", "/javascript/eXo/core/Util.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.DOMUtil", "/javascript/eXo/core/DOMUtil.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.Browser", "/javascript/eXo/core/Browser.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.MouseEventManager", "/javascript/eXo/core/MouseEventManager.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.UIMaskLayer", "/javascript/eXo/core/UIMaskLayer.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.Skin", "/javascript/eXo/core/Skin.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.DragDrop", "/javascript/eXo/core/DragDrop.js", ServletContext);
-JavascriptService.addJavascript("eXo.core.TemplateEngine", "/javascript/eXo/core/TemplateEngine.js", ServletContext);
+JavascriptService.addJavascript(&#34;eXo.core.Utils&#34;, &#34;/javascript/eXo/core/Util.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.core.DOMUtil&#34;, &#34;/javascript/eXo/core/DOMUtil.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.core.Browser&#34;, &#34;/javascript/eXo/core/Browser.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.core.MouseEventManager&#34;, &#34;/javascript/eXo/core/MouseEventManager.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.core.UIMaskLayer&#34;, &#34;/javascript/eXo/core/UIMaskLayer.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.core.Skin&#34;, &#34;/javascript/eXo/core/Skin.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.core.DragDrop&#34;, &#34;/javascript/eXo/core/DragDrop.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.core.TemplateEngine&#34;, &#34;/javascript/eXo/core/TemplateEngine.js&#34;, ServletContext);
 /* Widget Javascripts */
-JavascriptService.addJavascript("eXo.widget.UIWidget", "/javascript/eXo/widget/UIWidget.js", ServletContext);
-JavascriptService.addJavascript("eXo.widget.UIAddWidget", "/javascript/eXo/widget/UIAddWidget.js", ServletContext);
-JavascriptService.addJavascript("eXo.widget.UIExoWidget", "/javascript/eXo/widget/UIExoWidget.js", ServletContext);
+JavascriptService.addJavascript(&#34;eXo.widget.UIWidget&#34;, &#34;/javascript/eXo/widget/UIWidget.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.widget.UIAddWidget&#34;, &#34;/javascript/eXo/widget/UIAddWidget.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.widget.UIExoWidget&#34;, &#34;/javascript/eXo/widget/UIExoWidget.js&#34;, ServletContext);
 /* Desktop Javascripts */
-JavascriptService.addJavascript("eXo.desktop.UIDockbar", "/javascript/eXo/desktop/UIDockbar.js", ServletContext);
-JavascriptService.addJavascript("eXo.desktop.UIDesktop", "/javascript/eXo/desktop/UIDesktop.js", ServletContext);
+JavascriptService.addJavascript(&#34;eXo.desktop.UIDockbar&#34;, &#34;/javascript/eXo/desktop/UIDockbar.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.desktop.UIDesktop&#34;, &#34;/javascript/eXo/desktop/UIDesktop.js&#34;, ServletContext);
 /* WebUI Javascripts */ 
-JavascriptService.addJavascript("eXo.webui.UIItemSelector", "/javascript/eXo/webui/UIItemSelector.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIForm", "/javascript/eXo/webui/UIForm.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIPopup", "/javascript/eXo/webui/UIPopup.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIPopupSelectCategory", "/javascript/eXo/webui/UIPopupSelectCategory.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIPopupWindow", "/javascript/eXo/webui/UIPopupWindow.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIVerticalScroller", "/javascript/eXo/webui/UIVerticalScroller.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIHorizontalTabs", "/javascript/eXo/webui/UIHorizontalTabs.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIPopupMenu", "/javascript/eXo/webui/UIPopupMenu.js", ServletContext);
-JavascriptService.addJavascript("eXo.webui.UIDropDownControl", "/javascript/eXo/webui/UIDropDownControl.js", ServletContext);
+JavascriptService.addJavascript(&#34;eXo.webui.UIItemSelector&#34;, &#34;/javascript/eXo/webui/UIItemSelector.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.webui.UIForm&#34;, &#34;/javascript/eXo/webui/UIForm.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.webui.UIPopup&#34;, &#34;/javascript/eXo/webui/UIPopup.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.webui.UIPopupSelectCategory&#34;, &#34;/javascript/eXo/webui/UIPopupSelectCategory.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.webui.UIPopupWindow&#34;, &#34;/javascript/eXo/webui/UIPopupWindow.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.webui.UIVerticalScroller&#34;, &#34;/javascript/eXo/webui/UIVerticalScroller.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.webui.UIHorizontalTabs&#34;, &#34;/javascript/eXo/webui/UIHorizontalTabs.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.webui.UIPopupMenu&#34;, &#34;/javascript/eXo/webui/UIPopupMenu.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.webui.UIDropDownControl&#34;, &#34;/javascript/eXo/webui/UIDropDownControl.js&#34;, ServletContext);
 /* Portal Javascripts */ 
-JavascriptService.addJavascript("eXo.portal.PortalHttpRequest", "/javascript/eXo/portal/PortalHttpRequest.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.UIPortal", "/javascript/eXo/portal/UIPortal.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.UIWorkspace", "/javascript/eXo/portal/UIWorkspace.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.UIPortalControl", "/javascript/eXo/portal/UIPortalControl.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.PortalDragDrop", "/javascript/eXo/portal/PortalDragDrop.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.UIPortalNavigation", "/javascript/eXo/portal/UIPortalNavigation.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.UIMaskWorkspace", "/javascript/eXo/portal/UIMaskWorkspace.js", ServletContext);
-JavascriptService.addJavascript("eXo.portal.UIExoStartMenu", "/javascript/eXo/portal/UIExoStartMenu.js", ServletContext);
+JavascriptService.addJavascript(&#34;eXo.portal.PortalHttpRequest&#34;, &#34;/javascript/eXo/portal/PortalHttpRequest.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.portal.UIPortal&#34;, &#34;/javascript/eXo/portal/UIPortal.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.portal.UIWorkspace&#34;, &#34;/javascript/eXo/portal/UIWorkspace.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.portal.UIPortalControl&#34;, &#34;/javascript/eXo/portal/UIPortalControl.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.portal.PortalDragDrop&#34;, &#34;/javascript/eXo/portal/PortalDragDrop.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.portal.UIPortalNavigation&#34;, &#34;/javascript/eXo/portal/UIPortalNavigation.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.portal.UIMaskWorkspace&#34;, &#34;/javascript/eXo/portal/UIMaskWorkspace.js&#34;, ServletContext);
+JavascriptService.addJavascript(&#34;eXo.portal.UIExoStartMenu&#34;, &#34;/javascript/eXo/portal/UIExoStartMenu.js&#34;, ServletContext);
 /* Desktop Javascripts 2 */
-JavascriptService.addJavascript("eXo.desktop.UIWindow", "/javascript/eXo/desktop/UIWindow.js", ServletContext);
+JavascriptService.addJavascript(&#34;eXo.desktop.UIWindow&#34;, &#34;/javascript/eXo/desktop/UIWindow.js&#34;, ServletContext);
 </programlisting>
 	<para>
 		Note that even registered dedicated javascripts will be merged into a single <literal>merged.js</literal> file when the server loads. This reduces the number of HTTP calls as seen in the home page source code:
 	</para>
 	
-<programlisting>&lt;script type="text/javascript" src="/portal/javascript/merged.js"&gt;&lt;/script&gt;
+<programlisting>&#60;script type=&#34;text/javascript&#34; src=&#34;/portal/javascript/merged.js&#34;&#62;&#60;/script&#62;
 </programlisting>
 	<para>
-		Although this optimization is useful for a production environment, it may be easier to deactivate this optimization while debugging javascript problems. 
+		Although this optimization is useful for a production environment, it may be easier to deactivate this optimization while debugging javascript problems.
 	</para>
 	<para>
-		To do this, set the java system property <literal>exo.product.developing</literal> to <literal>true</literal>. 
+		To do this, set the java system property <literal>exo.product.developing</literal> to <literal>true</literal>.
 	</para>
 	<para>
-		To see or use the merged file set this property to <literal>false</literal>. 
+		To see or use the merged file set this property to <literal>false</literal>.
 	</para>
 	<para>
 		The property can be passed as a JVM parameter with the <literal>-D</literal> option in your <literal>GateIn.sh</literal> or <literal>GateIn.bat</literal> startup script.
 	</para>
 	<para>
-		Every javascript file is referenced with a module name of "<literal>eXo.core.DragDrop</literal>" which acts as a namespace. Inside the associated files, global javascript functions are used following the same namespace convention:
+		Every javascript file is referenced with a module name of &#34;<literal>eXo.core.DragDrop</literal>&#34; which acts as a namespace. Inside the associated files, global javascript functions are used following the same namespace convention:
 	</para>
 	
 <programlisting>eXo.core.DragDrop = new DragDrop() ;

Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Portal_Default_Permission_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Portal_Default_Permission_Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Portal_Default_Permission_Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Portal_Default_Permission_Configuration">
 	<title>Portal Default Permission Configuration</title>
@@ -14,107 +12,108 @@
 			It defines 5 permissions types:
 		</para>
 		<variablelist>
-		  <varlistentry>
-			<term>super.user</term>
-			<listitem>
-				<para>
-					The super user has all the rights on the platform, this user is referred to as <emphasis>root</emphasis>.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>portal.creator.groups</term>
-			<listitem>
-				<para>
-					This list defines all groups that will be able to manage the different portals. Members of this group also have the permission to create new portals. The format is "<literal>membership:/group/subgroup</literal> ".
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>navigation.creator.membership.type</term>
-			<listitem>
-				<para>
-					Defines the membership type of the group managers. The group managers have the permission to create and edit group pages and they can modify the group navigation.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>guests.group</term>
-			<listitem>
-				<para>
-					Any anonymous user automatically becomes a member of this group whent they enter the public pages.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>access.control.workspace</term>
-			<listitem>
-				<para>
-					Defines the users that have access to the control workspace. In the demo version the control workspace is accessible only to 'root' and 'john'. They can expand/collapse the workspace at the left hand side. The format is "membership:/group/subgroup", An asterisk '' gives permission to all memberships.
-				</para>
-			</listitem>
-		</varlistentry>
+			<varlistentry>
+				<term>super.user</term>
+				<listitem>
+					<para>
+						The super user has all the rights on the platform, this user is referred to as <emphasis>root</emphasis>.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>portal.creator.groups</term>
+				<listitem>
+					<para>
+						This list defines all groups that will be able to manage the different portals. Members of this group also have the permission to create new portals. The format is &#34;<literal>membership:/group/subgroup</literal> &#34;.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>navigation.creator.membership.type</term>
+				<listitem>
+					<para>
+						Defines the membership type of the group managers. The group managers have the permission to create and edit group pages and they can modify the group navigation.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>guests.group</term>
+				<listitem>
+					<para>
+						Any anonymous user automatically becomes a member of this group whent they enter the public pages.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>access.control.workspace</term>
+				<listitem>
+					<para>
+						Defines the users that have access to the control workspace. In the demo version the control workspace is accessible only to &#39;root&#39; and &#39;john&#39;. They can expand/collapse the workspace at the left hand side. The format is &#34;membership:/group/subgroup&#34;, An asterisk &#39;&#39; gives permission to all memberships.
+					</para>
+				</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 role="XML">&#60;component&#62;
+  &#60;key&#62;org.exoplatform.portal.config.UserACL&#60;/key&#62;
+  &#60;type&#62;org.exoplatform.portal.config.UserACL&#60;/type&#62;   
+  &#60;init-params&#62;      
+    &#60;value-param&#62;
+      &#60;name&#62;super.user&#60;/name&#62;
+      &#60;description&#62;administrator&#60;/description&#62;
+      &#60;value&#62;root&#60;/value&#62;     
+    &#60;/value-param&#62;
       
-    &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;
+    &#60;value-param&#62;
+      &#60;name&#62;portal.creator.groups&#60;/name&#62;
+      &#60;description&#62;groups with membership type have permission to manage portal&#60;/description&#62;
+      &#60;value&#62;*:/platform/administrators,*:/organization/management/executive-board&#60;/value&#62;     
+    &#60;/value-param&#62;
       
-    &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;
+    &#60;value-param&#62;
+      &#60;name&#62;navigation.creator.membership.type&#60;/name&#62;
+      &#60;description&#62;specific membership type have full permission with group navigation&#60;/description&#62;
+      &#60;value&#62;manager&#60;/value&#62;     
+    &#60;/value-param&#62;
+    &#60;value-param&#62;
+      &#60;name&#62;guests.group&#60;/name&#62;
+      &#60;description&#62;guests group&#60;/description&#62;
+      &#60;value&#62;/platform/guests&#60;/value&#62;     
+    &#60;/value-param&#62;     
+    &#60;value-param&#62;
+      &#60;name&#62;access.control.workspace&#60;/name&#62;
+      &#60;description&#62;groups with memberships that have the right to access the User Control Workspace&#60;/description&#62;
+      &#60;value&#62;*:/platform/administrators,*:/organization/management/executive-board&#60;/value&#62;     
+    &#60;/value-param&#62;           
+  &#60;/init-params&#62;   
+&#60;/component&#62;
 </programlisting>
 	</section>
 	
 	<section id="sect-Reference_Guide-Portal_Default_Permission_Configuration-Overwrite_Portal_Default_Permissions">
 		<title>Overwrite Portal Default Permissions</title>
 		
-<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 role="XML">&#60;external-component-plugins&#62;
+    &#60;target-component&#62;org.exoplatform.portal.config.UserACL&#60;/target-component&#62;
+    &#60;component-plugin&#62;
+      &#60;name&#62;addPortalACLPlugin&#60;/name&#62;
+      &#60;set-method&#62;addPortalACLPlugin&#60;/set-method&#62;
+      &#60;type&#62;org.exoplatform.portal.config.PortalACLPlugin&#60;/type&#62;
+      &#60;description&#62;setting some permission for portal&#60;/description&#62;
+      &#60;init-params&#62;     
+        &#60;values-param&#62;
+          &#60;name&#62;access.control.workspace.roles&#60;/name&#62;
+          &#60;value&#62;*:/platform/administrators&#60;/value&#62;
+          &#60;value&#62;*:/organization/management/executive-board&#60;/value&#62;       
+        &#60;/values-param&#62;
+        &#60;values-param&#62;
+          &#60;name&#62;portal.creation.roles&#60;/name&#62;
+          &#60;value&#62;*:/platform/administrators&#60;/value&#62;
+          &#60;value&#62;*:/organization/management/executive-board&#60;/value&#62;      
+        &#60;/values-param&#62;
+      &#60;/init-params&#62;
+    &#60;/component-plugin&#62;
+  &#60;/external-component-plugins&#62;
 </programlisting>
 	</section>
 

Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Portal_Navigation_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Portal_Navigation_Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Portal_Navigation_Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Portal_Navigation_Configuration">
 	<title>Portal Navigation Configuration</title>
@@ -13,88 +11,88 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					<xref linkend="sect-Reference_Guide-Portal_Navigation_Configuration-Portal_Navigation"/>
+					<xref linkend="sect-Reference_Guide-Portal_Navigation_Configuration-Portal_Navigation" />
 				</para>
 			</listitem>
 			<listitem>
 				<para>
-					<xref linkend="sect-Reference_Guide-Portal_Navigation_Configuration-Group_Navigation"/>
+					<xref linkend="sect-Reference_Guide-Portal_Navigation_Configuration-Group_Navigation" />
 				</para>
 			</listitem>
 			<listitem>
 				<para>
-					<xref linkend="sect-Reference_Guide-Portal_Navigation_Configuration-User_Navigation"/>
+					<xref linkend="sect-Reference_Guide-Portal_Navigation_Configuration-User_Navigation" />
 				</para>
 			</listitem>
 		</itemizedlist>
 		<para>
-			These navigations are configured with standard XML syntax in the file; "<filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename>".
+			These navigations are configured with standard XML syntax in the file; &#34;<filename>02portal.war:/WEB-INF/conf/portal/portal-configuration.xml</filename>&#34;.
 		</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 role="XML">&#60;component&#62;
+  &#60;key&#62;org.exoplatform.portal.config.UserPortalConfigService&#60;/key&#62;
+  &#60;type&#62;org.exoplatform.portal.config.UserPortalConfigService&#60;/type&#62;
+  &#60;component-plugins&#62;           
+   &#60;component-plugin&#62;
+     &#60;name&#62;new.portal.config.user.listener&#60;/name&#62;
+     &#60;set-method&#62;initListener&#60;/set-method&#62;
+     &#60;type&#62;org.exoplatform.portal.config.NewPortalConfigListener&#60;/type&#62;
+     &#60;description&#62;this listener init the portal configuration&#60;/description&#62;
+     &#60;init-params&#62;
+       &#60;value-param&#62;
+         &#60;name&#62;default.portal&#60;/name&#62;
+         &#60;description&#62;The default portal for checking db is empty or not&#60;/description&#62;
+         &#60;value&#62;classic&#60;/value&#62;
+       &#60;/value-param&#62; 
+       &#60;object-param&#62;
+         &#60;name&#62;portal.configuration&#60;/name&#62;
+         &#60;description&#62;description&#60;/description&#62;
+         &#60;object type=&#34;org.exoplatform.portal.config.NewPortalConfig&#34;&#62;
+           &#60;field  name=&#34;predefinedOwner&#34;&#62;
+             &#60;collection type=&#34;java.util.HashSet&#34;&#62;                
+               &#60;value&#62;&#60;string&#62;classic&#60;/string&#62;&#60;/value&#62;
+               &#60;value&#62;&#60;string&#62;webos&#60;/string&#62;&#60;/value&#62;
+             &#60;/collection&#62;
+           &#60;/field&#62;
+           &#60;field  name=&#34;ownerType&#34;&#62;&#60;string&#62;portal&#60;/string&#62;&#60;/field&#62;
+           &#60;field  name=&#34;templateLocation&#34;&#62;&#60;string&#62;war:/conf/portal&#60;/string&#62;&#60;/field&#62; 
+         &#60;/object&#62;
+       &#60;/object-param&#62; 
+       &#60;object-param&#62;
+         &#60;name&#62;group.configuration&#60;/name&#62;
+         &#60;description&#62;description&#60;/description&#62;
+         &#60;object type=&#34;org.exoplatform.portal.config.NewPortalConfig&#34;&#62;
+           &#60;field  name=&#34;predefinedOwner&#34;&#62;
+             &#60;collection type=&#34;java.util.HashSet&#34;&#62;            
+              &#60;value&#62;&#60;string&#62;platform/administrators&#60;/string&#62;&#60;/value&#62;    
+              &#60;value&#62;&#60;string&#62;platform/users&#60;/string&#62;&#60;/value&#62;
+              &#60;value&#62;&#60;string&#62;platform/guests&#60;/string&#62;&#60;/value&#62;
+              &#60;value&#62;&#60;string&#62;organization/management/executive-board&#60;/string&#62;&#60;/value&#62;               
+             &#60;/collection&#62;
+           &#60;/field&#62;
+           &#60;field  name=&#34;ownerType&#34;&#62;&#60;string&#62;group&#60;/string&#62;&#60;/field&#62;
+           &#60;field  name=&#34;templateLocation&#34;&#62;&#60;string&#62;war:/conf/portal&#60;/string&#62;&#60;/field&#62; 
+         &#60;/object&#62;
+       &#60;/object-param&#62;       
+       &#60;object-param&#62;
+         &#60;name&#62;user.configuration&#60;/name&#62;
+         &#60;description&#62;description&#60;/description&#62;
+         &#60;object type=&#34;org.exoplatform.portal.config.NewPortalConfig&#34;&#62;
+           &#60;field  name=&#34;predefinedOwner&#34;&#62;
+             &#60;collection type=&#34;java.util.HashSet&#34;&#62;                
+               &#60;value&#62;&#60;string&#62;root&#60;/string&#62;&#60;/value&#62;
+               &#60;value&#62;&#60;string&#62;john&#60;/string&#62;&#60;/value&#62;
+               &#60;value&#62;&#60;string&#62;mary&#60;/string&#62;&#60;/value&#62;
+               &#60;value&#62;&#60;string&#62;demo&#60;/string&#62;&#60;/value&#62;
+             &#60;/collection&#62;
+           &#60;/field&#62;
+           &#60;field  name=&#34;ownerType&#34;&#62;&#60;string&#62;user&#60;/string&#62;&#60;/field&#62;
+           &#60;field  name=&#34;templateLocation&#34;&#62;&#60;string&#62;war:/conf/portal&#60;/string&#62;&#60;/field&#62; 
+         &#60;/object&#62;
+       &#60;/object-param&#62;
+     &#60;/init-params&#62;
+   &#60;/component-plugin&#62;
+&#60;/component-plugins&#62;
 </programlisting>
 		<para>
 			This XML file defines, for the three navigations, which sets of portals, groups or users will have XML files inside the apprpriate <literal>war</literal>. Those files will be used to create an initial navigation the first time the portal is launched. That information will then be stored in the JCR and is then modifiable from the portal UI.
@@ -109,204 +107,207 @@
 		<para>
 			The <emphasis role="bold">classic</emphasis> portal is configured by four XML files in the <filename>portal/WEBINF/conf/portal/portal/classic</filename> directory:
 		</para>
-
-	<variablelist>
-	  <varlistentry>
-		<term>Portal.xml</term>
-		<listitem>
-			<para>
-				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 area (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;    
+		<variablelist>
+			<varlistentry>
+				<term>Portal.xml</term>
+				<listitem>
+					<para>
+						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 area (even the banner and footer) is a portlet.
+					</para>
+					
+<programlisting role="XML">&#60;?xml version=&#34;1.0&#34; encoding=&#34;ISO-8859-1&#34;?&#62;
+&#60;portal-config&#62;
+  &#60;portal-name&#62;classic&#60;/portal-name&#62;
+  &#60;locale&#62;en&#60;/locale&#62;
+  &#60;factory-id&#62;office&#60;/factory-id&#62;
+  &#60;access-permissions&#62;Everyone&#60;/access-permissions&#62;
+  &#60;edit-permission&#62;*:/platform/administrators&#60;/edit-permission&#62;
+  &#60;creator&#62;root&#60;/creator&#62;    
     
-  &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;
+  &#60;portal-layout&#62;   
+  &#60;application&#62;
+     &#60;instance-id&#62;portal#classic:/web/BannerPortlet/banner&#60;/instance-id&#62;
+     &#60;show-info-bar&#62;false&#60;/show-info-bar&#62;
+   &#60;/application&#62;
+   &#60;application&#62;
+    &#60;instance-id&#62;portal#classic:/web/NavigationPortlet/toolbar&#60;/instance-id&#62;
+     &#60;show-info-bar&#62;false&#60;/show-info-bar&#62;
+   &#60;/application&#62;
   
-   &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;
+   &#60;application&#62;
+     &#60;instance-id&#62;portal#classic:/web/BreadcumbsPortlet/breadcumbs&#60;/instance-id&#62;
+     &#60;show-info-bar&#62;false&#60;/show-info-bar&#62;
+   &#60;/application&#62;
    
  
-   &lt;page-body&gt; &lt;/page-body&gt;
+   &#60;page-body&#62; &#60;/page-body&#62;
    
-   &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;
+   &#60;application&#62;
+     &#60;instance-id&#62;portal#classic:/web/FooterPortlet/footer&#60;/instance-id&#62;
+     &#60;show-info-bar&#62;false&#60;/show-info-bar&#62;
+   &#60;/application&#62;
+  &#60;/portal-layout&#62;
   
-&lt;/portal-config&gt;
+&#60;/portal-config&#62;
 </programlisting>
-			<para>
-				It is also possible to apply a nested container that can also contain portlets. Row, column or tab containers are then responsible of the layout of their child portlets.
-			</para>
-			<para>
-				Each application references a portlet using the id <literal>portal#{portalName}:/{portletWarName}/{portletName}/{uniqueId}</literal> 
-			</para>
-			<para>
-				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.
-			</para>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>Navigation.xml</term>
-		<listitem>
-			<para>
-				This file defines all the navigation nodes the portal will have. The syntax is simple, using nested node tags. Each node references a page that is defined in the next XML file.
-			</para>
-			<para>
-				If the label <literal>#{}</literal> node label is used, the internationalization mechanism is activated and the actual label to render is taken from an associated properties file for 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;
+					<para>
+						It is also possible to apply a nested container that can also contain portlets. Row, column or tab containers are then responsible of the layout of their child portlets.
+					</para>
+					<para>
+						Each application references a portlet using the id <literal>portal#{portalName}:/{portletWarName}/{portletName}/{uniqueId}</literal>
+					</para>
+					<para>
+						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 &#34;Everyone&#34; (at <literal>/portal/public/classic</literal>) but only members of the group <literal>/platform/administrators</literal> can edit it.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>Navigation.xml</term>
+				<listitem>
+					<para>
+						This file defines all the navigation nodes the portal will have. The syntax is simple, using nested node tags. Each node references a page that is defined in the next XML file.
+					</para>
+					<para>
+						If the label <literal>#{}</literal> node label is used, the internationalization mechanism is activated and the actual label to render is taken from an associated properties file for the current locale.
+					</para>
+					
+<programlisting role="XML">&#60;?xml version=&#34;1.0&#34; encoding=&#34;UTF-8&#34;?&#62;
+&#60;node-navigation&#62;
+  &#60;owner-type&#62;portal&#60;/owner-type&#62;
+  &#60;owner-id&#62;classic&#60;/owner-id&#62;
+  &#60;priority&#62;1&#60;/priority&#62;
+  &#60;page-nodes&#62;
+   &#60;node&#62;
+     &#60;uri&#62;home&#60;/uri&#62;
+     &#60;name&#62;home&#60;/name&#62;
+     &#60;label&#62;#{portal.classic.home}&#60;/label&#62;
+     &#60;page-reference&#62;portal::classic::homepage&#60;/page-reference&#62;     
+   &#60;/node&#62;    
+   &#60;node&#62;
+     &#60;uri&#62;webexplorer&#60;/uri&#62;
+     &#60;name&#62;webexplorer&#60;/name&#62;
+     &#60;label&#62;#{portal.classic.webexplorer}&#60;/label&#62;
+     &#60;page-reference&#62;portal::classic::webexplorer&#60;/page-reference&#62;     
+   &#60;/node&#62;
+  &#60;/page-nodes&#62;
+&#60;/node-navigation&#62;
 </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>
-			<warning>
-				<para>
-					For top nodes, the <emphasis role="bold">uri</emphasis> and the <emphasis role="bold">name</emphasis> of your navigation nodes must have the <emphasis>same</emphasis> value. For the other nodes the <emphasis role="bold">uri</emphasis> is composed like <emphasis><uri>contentmanagement/fileexplorer</uri></emphasis> where '<literal>contentmanagement</literal> ' is the name of the parent node and '<literal>fileexplorer</literal>' is the name of the node ( <emphasis>&lt;name&gt;fileexplorer&lt;/name&gt; </emphasis> ).
-				</para>
-			</warning>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>Pages.xml</term>
-		<listitem>
-			<para>
-				This XML 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 icons or the 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;    
+					<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>
+					<warning>
+						<para>
+							For top nodes, the <emphasis role="bold">uri</emphasis> and the <emphasis role="bold">name</emphasis> of your navigation nodes must have the <emphasis>same</emphasis> value. For the other nodes the <emphasis role="bold">uri</emphasis> is composed like <emphasis><uri>contentmanagement/fileexplorer</uri></emphasis> where &#39;<literal>contentmanagement</literal> &#39; is the name of the parent node and &#39;<literal>fileexplorer</literal>&#39; is the name of the node ( <emphasis>&#60;name&#62;fileexplorer&#60;/name&#62; </emphasis> ).
+						</para>
+					</warning>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>Pages.xml</term>
+				<listitem>
+					<para>
+						This XML 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 icons or the mode.
+					</para>
+					
+<programlisting role="XML">&#60;?xml version=&#34;1.0&#34; encoding=&#34;ISO-8859-1&#34;?&#62;
+&#60;page-set&#62;  
+  &#60;page&#62;
+    &#60;page-id&#62;portal::classic::homepage&#60;/page-id&#62;
+    &#60;owner-type&#62;portal&#60;/owner-type&#62;
+    &#60;owner-id&#62;classic&#60;/owner-id&#62;
+    &#60;name&#62;homepage&#60;/name&#62;
+    &#60;title&#62;Home Page&#60;/title&#62;
+    &#60;access-permissions&#62;Everyone&#60;/access-permissions&#62;
+    &#60;edit-permission&#62;*:/platform/administrators&#60;/edit-permission&#62;
+    &#60;application&#62;
+      &#60;instance-id&#62;portal#classic:/web/HomePagePortlet/homepageportlet&#60;/instance-id&#62;
+      &#60;title&#62;Home Page portlet&#60;/title&#62;
+      &#60;show-info-bar&#62;false&#60;/show-info-bar&#62;
+      &#60;show-application-state&#62;false&#60;/show-application-state&#62;
+      &#60;show-application-mode&#62;false&#60;/show-application-mode&#62;
+    &#60;/application&#62;
+  &#60;/page&#62;    
     
-  &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;
+  &#60;page&#62;
+    &#60;page-id&#62;portal::classic::webexplorer&#60;/page-id&#62;
+    &#60;owner-type&#62;portal&#60;/owner-type&#62;
+    &#60;owner-id&#62;classic&#60;/owner-id&#62;
+    &#60;name&#62;webexplorer&#60;/name&#62;
+    &#60;title&#62;Web Explorer&#60;/title&#62;
+    &#60;access-permissions&#62;*:/platform/users&#60;/access-permissions&#62;
+    &#60;edit-permission&#62;*:/platform/administrators&#60;/edit-permission&#62;    
+    &#60;application&#62;
+      &#60;instance-id&#62;group#platform/users:/web/BrowserPortlet/WebExplorer&#60;/instance-id&#62;
+      &#60;title&#62;Web Explorer&#60;/title&#62;
+      &#60;show-info-bar&#62;false&#60;/show-info-bar&#62;
+    &#60;/application&#62;  
+  &#60;/page&#62;  
+&#60;/page-set&#62;
 </programlisting>
-		</listitem>
-	</varlistentry>
-	<varlistentry>
-		<term>Portlet-preferences.xml</term>
-		<listitem>
-			<para>
-				Porlet instances can be associated with <literal>portlet-preferences</literal> that override the one defined in <filename>portlet.xml </filename>file 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;
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>Portlet-preferences.xml</term>
+				<listitem>
+					<para>
+						Porlet instances can be associated with <literal>portlet-preferences</literal> that override the one defined in <filename>portlet.xml </filename>file of the portlet application <literal>war</literal> .
+					</para>
+					
+<programlisting role="XML">&#60;?xml version=&#34;1.0&#34; encoding=&#34;ISO-8859-1&#34;?&#62;
+&#60;portlet-preferences-set&#62;
+  &#60;portlet-preferences&#62;
+    &#60;owner-type&#62;portal&#60;/owner-type&#62;
+    &#60;owner-id&#62;classic&#60;/owner-id&#62;
+    &#60;window-id&#62;portal#classic:/web/BannerPortlet/banner&#60;/window-id&#62;
+    &#60;preference&#62;
+      &#60;name&#62;template&#60;/name&#62;
+      &#60;value&#62;par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl&#60;/value&#62;
+      &#60;read-only&#62;false&#60;/read-only&#62;
+    &#60;/preference&#62;
+  &#60;/portlet-preferences&#62;
+  &#60;portlet-preferences&#62;
+    &#60;owner-type&#62;portal&#60;/owner-type&#62;
+    &#60;owner-id&#62;classic&#60;/owner-id&#62;
+    &#60;window-id&#62;portal#classic:/web/NavigationPortlet/toolbar&#60;/window-id&#62;
+    &#60;preference&#62;
+      &#60;name&#62;useAJAX&#60;/name&#62;
+      &#60;value&#62;true&#60;/value&#62;
+      &#60;read-only&#62;false&#60;/read-only&#62;
+    &#60;/preference&#62;
+  &#60;/portlet-preferences&#62;
+  &#60;portlet-preferences&#62;
+    &#60;owner-type&#62;portal&#60;/owner-type&#62;
+    &#60;owner-id&#62;classic&#60;/owner-id&#62;
+    &#60;window-id&#62;portal#classic:/web/FooterPortlet/footer&#60;/window-id&#62;
+    &#60;preference&#62;
+      &#60;name&#62;template&#60;/name&#62;
+      &#60;value&#62;par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl&#60;/value&#62;
+      &#60;read-only&#62;false&#60;/read-only&#62;
+    &#60;/preference&#62;
+  &#60;/portlet-preferences&#62;
   
   
-  &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;
+  &#60;portlet-preferences&#62;
+    &#60;owner-type&#62;portal&#60;/owner-type&#62;
+    &#60;owner-id&#62;classic&#60;/owner-id&#62;
+    &#60;window-id&#62;portal#classic:/web/GroovyPortlet/groovyportlet&#60;/window-id&#62;
+    &#60;preference&#62;
+      &#60;name&#62;template&#60;/name&#62;
+      &#60;value&#62;par:/groovy/groovy/webui/component/UIGroovyPortlet.gtmpl&#60;/value&#62;
+      &#60;read-only&#62;false&#60;/read-only&#62;
+    &#60;/preference&#62;
+  &#60;/portlet-preferences&#62;
+&#60;/portlet-preferences-set&#62;
 </programlisting>
-
-		</listitem>
-	</varlistentry>
-	</variablelist>
+				</listitem>
+			</varlistentry>
+		</variablelist>
 	</section>
-<!--	<section id="sect-Reference_Guide-Portal_Navigation_Configuration-Portal.xml">
+	
+	<!-- 	<section id="sect-Reference_Guide-Portal_Navigation_Configuration-Portal.xml">
 		<title>Portal.xml</title>
 		<para>
 			That file describes the layout and portlets that will be shown for all pages. Usually the layout contains the banner, footer, menu, breadcrumbs portlets. Indeed, in GateIn, every area is a portlet even the banner and footer which makes the platform extremely configurable.
@@ -496,73 +497,73 @@
   &lt;/portlet-preferences&gt;
 &lt;/portlet-preferences-set&gt;
 </programlisting>
-	</section> -->
-	
+	</section>  -->
 	<section id="sect-Reference_Guide-Portal_Navigation_Configuration-Group_Navigation">
 		<title>Group Navigation</title>
 		<para>
 			Group navigations are dynamically added to the user navigation at login. This allows users to see all the pages assigned to any groups they belong to in the menu.
 		</para>
 		<para>
-			The group navigation menu is configured by three XML files (<filename>navigation.xml</filename>, <filename>pages.xml</filename> and <filename>portlet-preferences.xml</filename>). The syntax used in these files is the same as those covered in <xref linkend="sect-Reference_Guide-Portal_Navigation_Configuration-Portal_Navigation"/>. 
-		</para>	
+			The group navigation menu is configured by three XML files (<filename>navigation.xml</filename>, <filename>pages.xml</filename> and <filename>portlet-preferences.xml</filename>). The syntax used in these files is the same as those covered in <xref linkend="sect-Reference_Guide-Portal_Navigation_Configuration-Portal_Navigation" />.
+		</para>
 		<para>
-			They are located in the <filename>portal/WEB-INF/conf/portal/group<replaceable>/group-name-path/</replaceable></filename> directory (For example; <filename>portal/WEB-INF/conf/portal/group/platform/administrators/</filename>). 
+			They are located in the <filename>portal/WEB-INF/conf/portal/group<replaceable>/group-name-path/</replaceable></filename> directory (For example; <filename>portal/WEB-INF/conf/portal/group/platform/administrators/</filename>).
 		</para>
 	</section>
 	
 	<section id="sect-Reference_Guide-Portal_Navigation_Configuration-User_Navigation">
 		<title>User Navigation</title>
 		<para>
-			The user navigation is the set of nodes and pages that are owned by a user. They are part of the user dashboard. 
-		</para>	
+			The user navigation is the set of nodes and pages that are owned by a user. They are part of the user dashboard.
+		</para>
 		<para>
-			Three files configure the user navigation (<filename>navigation.xml</filename>, <filename>pages.xml</filename> and <filename>portlet-preferences.xml</filename>). They are located in the directory "<filename>portal/WEB-INF/conf/portal/users/{userName}</filename>".
+			Three files configure the user navigation (<filename>navigation.xml</filename>, <filename>pages.xml</filename> and <filename>portlet-preferences.xml</filename>). They are located in the directory &#34;<filename>portal/WEB-INF/conf/portal/users/{userName}</filename>&#34;.
 		</para>
 		<para>
 			This directory also contains a <filename>gadgets.xml</filename> file (which was formerly called <filename>widgets.xml</filename>). This file defines the gadgets located in the user workspace.
-		</para>	
+		</para>
 		<para>
 			The user 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 role="XML">&#60;?xml version=&#34;1.0&#34; encoding=&#34;ISO-8859-1&#34;?&#62;
+&#60;widgets&#62;
+  &#60;owner-type&#62;user&#60;/owner-type&#62;
+  &#60;owner-id&#62;root&#60;/owner-id&#62;
  
-  &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;
+  &#60;container id=&#34;Information&#34;&#62;
+    &#60;name&#62;Information&#60;/name&#62;
+    &#60;description&#62;Information&#39;s Description&#60;/description&#62;
+    &#60;application&#62;
+      &#60;instance-id&#62;user#root:/GateInWidgetWeb/WelcomeWidget/WelcomeWidget1&#60;/instance-id&#62;
+      &#60;application-type&#62;GateInWidget&#60;/application-type&#62;
+    &#60;/application&#62;
       
-    &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;
+    &#60;application&#62;
+      &#60;instance-id&#62;user#root:/GateInWidgetWeb/StickerWidget/StickerWidget&#60;/instance-id&#62;
+      &#60;application-type&#62;GateInWidget&#60;/application-type&#62; 
+    &#60;/application&#62;
     
-    &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;
+    &#60;application&#62;
+      &#60;instance-id&#62;user#root:/GateInWidgetWeb/InfoWidget/InfoWidget1&#60;/instance-id&#62;
+      &#60;application-type&#62;GateInWidget&#60;/application-type&#62;
+    &#60;/application&#62;
+  &#60;/container&#62;
   
-  &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; 
+  &#60;container id=&#34;Calendar&#34;&#62;
+    &#60;name&#62;Calendar&#60;/name&#62;
+    &#60;description&#62;Calendar&#39;s Description&#60;/description&#62;
+    &#60;application&#62;
+      &#60;instance-id&#62;user#root:/GateInWidgetWeb/CalendarWidget/CalendarWidget&#60;/instance-id&#62;
+      &#60;application-type&#62;GateInWidget&#60;/application-type&#62; 
+    &#60;/application&#62;
+  &#60;/container&#62; 
  
-&lt;/widgets&gt;
+&#60;/widgets&#62;
 </programlisting>
-<!--		<para>
+		<!-- 		<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> -->
+		</para>  -->
 	</section>
 	
 	<section id="sect-Reference_Guide-Portal_Navigation_Configuration-Tips">
@@ -570,40 +571,42 @@
 		<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 you first have to define a "page" which will not be used. Then add the URL to the navigation. 
+				If you wish to add a link to a URL outside the portal you you first have to define a &#34;page&#34; which will not be used. Then add the URL to the navigation.
 			</para>
 			<variablelist>
-			  <varlistentry>
-				<term>pages.xml</term>
-				<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;
+				<varlistentry>
+					<term>pages.xml</term>
+					<listitem>
+						<para>
+							
+<programlisting>&#60;page&#62;
+  &#60;owner-type&#62;portal&#60;/owner-type&#62;
+  &#60;owner-id&#62;website&#60;/owner-id&#62;
+  &#60;name&#62;documentation&#60;/name&#62;
+  &#60;title&#62;Documentation&#60;/title&#62;
+  &#60;access-permissions&#62;Everyone&#60;/access-permissions&#62;
+  &#60;edit-permission&#62;*:/platform/administrators&#60;/edit-permission&#62;
+&#60;/page&#62;
 </programlisting>
-					</para>
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term>navigation.xml</term>
-				<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;
+						</para>
+					</listitem>
+				</varlistentry>
+				<varlistentry>
+					<term>navigation.xml</term>
+					<listitem>
+						<para>
+							
+<programlisting>&#60;node&#62;
+  &#60;uri&#62;http://wiki.exoplatform.com/xwiki/bin/view/Main/WebHome&#60;/uri&#62;
+  &#60;name&#62;documentation&#60;/name&#62;
+  &#60;label&#62;#{portal.classic.documentation}&#60;/label&#62;
+  &#60;page-reference&#62;portal::website::documentation&#60;/page-reference&#62;
+&#60;/node&#62;
 </programlisting>
-					</para>
-				</listitem>
-			</varlistentry>
-			</variablelist>			
+						</para>
+					</listitem>
+				</varlistentry>
+			</variablelist>
 			<warning>
 				<title>Direct external links were not a design goal</title>
 				<para>

Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Predefined_User_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Predefined_User_Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Predefined_User_Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Predefined_User_Configuration">
 	<title>Predefined User Configuration</title>
@@ -12,140 +10,139 @@
 		</para>
 	</section>
 	
-	<section id="sect-Reference_Guide-Predefined_User_Configuration-Plugin_for_adding_users_groups_and_membership_types_">
+	<section id="sect-Reference_Guide-Predefined_User_Configuration-Plugin_for_adding_users_groups_and_membership_types">
 		<title>Plugin for adding users, groups and membership types</title>
 		<para>
-			The plugin of type <literal>org.exoplatform.services.organization.OrganizationDatabaseInitializer</literal> specifies the list of users, groups and membership types to be created. 
-		</para>	
+			The plugin of type <literal>org.exoplatform.services.organization.OrganizationDatabaseInitializer</literal> specifies the list of users, groups and membership types to be created.
+		</para>
 		<para>
-			The initialization parameter "<parameter>checkDatabaseAlgorithm</parameter>" determines how the creation is triggered.
+			The initialization parameter &#34;<parameter>checkDatabaseAlgorithm</parameter>&#34; determines how the creation is triggered.
 		</para>
-			
 		<para>
-			The value "<literal>entry</literal>" means that each user, group and membership listed in the configuration file is checked each time &PRODUCT; is started. If the entry doesn't exist, it is created. The value "<literal>empty</literal>" sets the configuration file to be processed only if the database is empty.
+			The value &#34;<literal>entry</literal>&#34; means that each user, group and membership listed in the configuration file is checked each time &PRODUCT; is started. If the entry doesn&#39;t exist, it is created. The value &#34;<literal>empty</literal>&#34; sets the configuration file to be processed only if the database is empty.
 		</para>
 	</section>
 	
 	<section id="sect-Reference_Guide-Predefined_User_Configuration-Membership_types">
 		<title>Membership types</title>
 		<para>
-			The predefined membership types are specified in the "<parameter>membershipType</parameter>" field of the "<parameter>OrganizationConfig</parameter>" plugin parameter.
+			The predefined membership types are specified in the &#34;<parameter>membershipType</parameter>&#34; field of the &#34;<parameter>OrganizationConfig</parameter>&#34; plugin parameter.
 		</para>
 		
-<programlisting role="XML">&lt;field name="membershipType"&gt;
-  &lt;collection type="java.util.ArrayList"&gt;
-    &lt;value&gt;
-      &lt;object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"&gt;
-        &lt;field name="type"&gt;
-          &lt;string&gt;member&lt;/string&gt;
-        &lt;/field&gt;
-        &lt;field name="description"&gt;
-          &lt;string&gt;member membership type&lt;/string&gt;
-        &lt;/field&gt;
-      &lt;/object&gt;
-    &lt;/value&gt;
-    &lt;value&gt;
-      &lt;object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"&gt;
-        &lt;field name="type"&gt;
-          &lt;string&gt;owner&lt;/string&gt;
-        &lt;/field&gt;
-        &lt;field name="description"&gt;
-          &lt;string&gt;owner membership type&lt;/string&gt;
-        &lt;/field&gt;
-      &lt;/object&gt;
-     &lt;/value&gt;
-     &lt;value&gt;
-       &lt;object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"&gt;
-         &lt;field name="type"&gt;
-           &lt;string&gt;validator&lt;/string&gt;
-         &lt;/field&gt;
-         &lt;field name="description"&gt;
-           &lt;string&gt;validator membership type&lt;/string&gt;
-         &lt;/field&gt;
-       &lt;/object&gt;
-     &lt;/value&gt;
-   &lt;/collection&gt;
-&lt;/field&gt;
+<programlisting role="XML">&#60;field name=&#34;membershipType&#34;&#62;
+  &#60;collection type=&#34;java.util.ArrayList&#34;&#62;
+    &#60;value&#62;
+      &#60;object type=&#34;org.exoplatform.services.organization.OrganizationConfig$MembershipType&#34;&#62;
+        &#60;field name=&#34;type&#34;&#62;
+          &#60;string&#62;member&#60;/string&#62;
+        &#60;/field&#62;
+        &#60;field name=&#34;description&#34;&#62;
+          &#60;string&#62;member membership type&#60;/string&#62;
+        &#60;/field&#62;
+      &#60;/object&#62;
+    &#60;/value&#62;
+    &#60;value&#62;
+      &#60;object type=&#34;org.exoplatform.services.organization.OrganizationConfig$MembershipType&#34;&#62;
+        &#60;field name=&#34;type&#34;&#62;
+          &#60;string&#62;owner&#60;/string&#62;
+        &#60;/field&#62;
+        &#60;field name=&#34;description&#34;&#62;
+          &#60;string&#62;owner membership type&#60;/string&#62;
+        &#60;/field&#62;
+      &#60;/object&#62;
+     &#60;/value&#62;
+     &#60;value&#62;
+       &#60;object type=&#34;org.exoplatform.services.organization.OrganizationConfig$MembershipType&#34;&#62;
+         &#60;field name=&#34;type&#34;&#62;
+           &#60;string&#62;validator&#60;/string&#62;
+         &#60;/field&#62;
+         &#60;field name=&#34;description&#34;&#62;
+           &#60;string&#62;validator membership type&#60;/string&#62;
+         &#60;/field&#62;
+       &#60;/object&#62;
+     &#60;/value&#62;
+   &#60;/collection&#62;
+&#60;/field&#62;
 </programlisting>
 	</section>
 	
 	<section id="sect-Reference_Guide-Predefined_User_Configuration-Groups">
 		<title>Groups</title>
 		<para>
-			The predefined groups are specified in the "group" field of the "<parameter>OrganizationConfig</parameter>" plugin parameter.
+			The predefined groups are specified in the &#34;group&#34; field of the &#34;<parameter>OrganizationConfig</parameter>&#34; plugin parameter.
 		</para>
 		
-<programlisting role="XML">&lt;field name="group"&gt;
-  &lt;collection type="java.util.ArrayList"&gt;
-    &lt;value&gt;
-      &lt;object type="org.exoplatform.services.organization.OrganizationConfig$Group"&gt;
-        &lt;field name="name"&gt;
-          &lt;string&gt;portal&lt;/string&gt;
-        &lt;/field&gt;
-        &lt;field name="parentId"&gt;
-          &lt;string&gt;&lt;/string&gt;
-        &lt;/field&gt;
-        &lt;field name="type"&gt;
-          &lt;string&gt;hierachy&lt;/string&gt;
-        &lt;/field&gt;
-        &lt;field name="description"&gt;
-          &lt;string&gt;the /portal group&lt;/string&gt;
-        &lt;/field&gt;
-      &lt;/object&gt;
-    &lt;/value&gt;
-    &lt;value&gt;
-      &lt;object type="org.exoplatform.services.organization.OrganizationConfig$Group"&gt;
-        &lt;field name="name"&gt;
-          &lt;string&gt;community&lt;/string&gt;
-        &lt;/field&gt;
-        &lt;field name="parentId"&gt;
-          &lt;string&gt;/portal&lt;/string&gt;
-        &lt;/field&gt;
-        &lt;field name="type"&gt;
-          &lt;string&gt;hierachy&lt;/string&gt;
-        &lt;/field&gt;
-        &lt;field name="description"&gt;
-          &lt;string&gt;the /portal/community group&lt;/string&gt;
-        &lt;/field&gt;
-      &lt;/object&gt;
-    &lt;/value&gt;
+<programlisting role="XML">&#60;field name=&#34;group&#34;&#62;
+  &#60;collection type=&#34;java.util.ArrayList&#34;&#62;
+    &#60;value&#62;
+      &#60;object type=&#34;org.exoplatform.services.organization.OrganizationConfig$Group&#34;&#62;
+        &#60;field name=&#34;name&#34;&#62;
+          &#60;string&#62;portal&#60;/string&#62;
+        &#60;/field&#62;
+        &#60;field name=&#34;parentId&#34;&#62;
+          &#60;string&#62;&#60;/string&#62;
+        &#60;/field&#62;
+        &#60;field name=&#34;type&#34;&#62;
+          &#60;string&#62;hierachy&#60;/string&#62;
+        &#60;/field&#62;
+        &#60;field name=&#34;description&#34;&#62;
+          &#60;string&#62;the /portal group&#60;/string&#62;
+        &#60;/field&#62;
+      &#60;/object&#62;
+    &#60;/value&#62;
+    &#60;value&#62;
+      &#60;object type=&#34;org.exoplatform.services.organization.OrganizationConfig$Group&#34;&#62;
+        &#60;field name=&#34;name&#34;&#62;
+          &#60;string&#62;community&#60;/string&#62;
+        &#60;/field&#62;
+        &#60;field name=&#34;parentId&#34;&#62;
+          &#60;string&#62;/portal&#60;/string&#62;
+        &#60;/field&#62;
+        &#60;field name=&#34;type&#34;&#62;
+          &#60;string&#62;hierachy&#60;/string&#62;
+        &#60;/field&#62;
+        &#60;field name=&#34;description&#34;&#62;
+          &#60;string&#62;the /portal/community group&#60;/string&#62;
+        &#60;/field&#62;
+      &#60;/object&#62;
+    &#60;/value&#62;
     ...
-  &lt;/collection&gt;
-&lt;/field&gt;
+  &#60;/collection&#62;
+&#60;/field&#62;
 </programlisting>
 	</section>
 	
 	<section id="sect-Reference_Guide-Predefined_User_Configuration-Users">
 		<title>Users</title>
 		<para>
-			The predefined users are specified in the "<parameter>membershipType</parameter>" field of the "<parameter>OrganizationConfig</parameter>" plugin parameter.
+			The predefined users are specified in the &#34;<parameter>membershipType</parameter>&#34; field of the &#34;<parameter>OrganizationConfig</parameter>&#34; plugin parameter.
 		</para>
 		
-<programlisting role="XML">&lt;field name="user"&gt;
-  &lt;collection type="java.util.ArrayList"&gt;
-    &lt;value&gt;
-      &lt;object type="org.exoplatform.services.organization.OrganizationConfig$User"&gt;
-        &lt;field name="userName"&gt;&lt;string&gt;root&lt;/string&gt;&lt;/field&gt;
-        &lt;field name="password"&gt;&lt;string&gt;exo&lt;/string&gt;&lt;/field&gt;
-        &lt;field name="firstName"&gt;&lt;string&gt;root&lt;/string&gt;&lt;/field&gt;
-        &lt;field name="lastName"&gt;&lt;string&gt;root&lt;/string&gt;&lt;/field&gt;
-        &lt;field name="email"&gt;&lt;string&gt;exoadmin at localhost&lt;/string&gt;&lt;/field&gt;
-        &lt;field name="groups"&gt;&lt;string&gt;member:/admin,member:/user,owner:/portal/admin&lt;/string&gt;&lt;/field&gt;
-      &lt;/object&gt;
-    &lt;/value&gt;
-    &lt;value&gt;
-      &lt;object type="org.exoplatform.services.organization.OrganizationConfig$User"&gt;
-        &lt;field name="userName"&gt;&lt;string&gt;exo&lt;/string&gt;&lt;/field&gt;
-        &lt;field name="password"&gt;&lt;string&gt;exo&lt;/string&gt;&lt;/field&gt;
-        &lt;field name="firstName"&gt;&lt;string&gt;site&lt;/string&gt;&lt;/field&gt;
-        &lt;field name="lastName"&gt;&lt;string&gt;site&lt;/string&gt;&lt;/field&gt;
-        &lt;field name="email"&gt;&lt;string&gt;exo at localhost&lt;/string&gt;&lt;/field&gt;
-        &lt;field name="groups"&gt;&lt;string&gt;member:/user&lt;/string&gt;&lt;/field&gt;
-      &lt;/object&gt;
-    &lt;/value&gt;
+<programlisting role="XML">&#60;field name=&#34;user&#34;&#62;
+  &#60;collection type=&#34;java.util.ArrayList&#34;&#62;
+    &#60;value&#62;
+      &#60;object type=&#34;org.exoplatform.services.organization.OrganizationConfig$User&#34;&#62;
+        &#60;field name=&#34;userName&#34;&#62;&#60;string&#62;root&#60;/string&#62;&#60;/field&#62;
+        &#60;field name=&#34;password&#34;&#62;&#60;string&#62;exo&#60;/string&#62;&#60;/field&#62;
+        &#60;field name=&#34;firstName&#34;&#62;&#60;string&#62;root&#60;/string&#62;&#60;/field&#62;
+        &#60;field name=&#34;lastName&#34;&#62;&#60;string&#62;root&#60;/string&#62;&#60;/field&#62;
+        &#60;field name=&#34;email&#34;&#62;&#60;string&#62;exoadmin at localhost&#60;/string&#62;&#60;/field&#62;
+        &#60;field name=&#34;groups&#34;&#62;&#60;string&#62;member:/admin,member:/user,owner:/portal/admin&#60;/string&#62;&#60;/field&#62;
+      &#60;/object&#62;
+    &#60;/value&#62;
+    &#60;value&#62;
+      &#60;object type=&#34;org.exoplatform.services.organization.OrganizationConfig$User&#34;&#62;
+        &#60;field name=&#34;userName&#34;&#62;&#60;string&#62;exo&#60;/string&#62;&#60;/field&#62;
+        &#60;field name=&#34;password&#34;&#62;&#60;string&#62;exo&#60;/string&#62;&#60;/field&#62;
+        &#60;field name=&#34;firstName&#34;&#62;&#60;string&#62;site&#60;/string&#62;&#60;/field&#62;
+        &#60;field name=&#34;lastName&#34;&#62;&#60;string&#62;site&#60;/string&#62;&#60;/field&#62;
+        &#60;field name=&#34;email&#34;&#62;&#60;string&#62;exo at localhost&#60;/string&#62;&#60;/field&#62;
+        &#60;field name=&#34;groups&#34;&#62;&#60;string&#62;member:/user&#60;/string&#62;&#60;/field&#62;
+      &#60;/object&#62;
+    &#60;/value&#62;
     ...
-  &lt;/collection&gt;
-&lt;/field&gt;
+  &#60;/collection&#62;
+&#60;/field&#62;
 </programlisting>
 	</section>
 	
@@ -155,38 +152,38 @@
 			The plugin of type <literal>org.exoplatform.services.organization.impl.NewUserEventListener </literal> specifies which groups should join all newly created users. It notably specifies the groups and memberships to be used. It also specifies a list of users that should be excepted.
 		</para>
 		
-<programlisting role="XML">&lt;component-plugin&gt;
-  &lt;name&gt;new.user.event.listener&lt;/name&gt;
-  &lt;set-method&gt;addListenerPlugin&lt;/set-method&gt;
-  &lt;type&gt;org.exoplatform.services.organization.impl.NewUserEventListener&lt;/type&gt;
-  &lt;description&gt;this listener assign group and membership to a new created user&lt;/description&gt;
-  &lt;init-params&gt;
-    &lt;object-param&gt;
-      &lt;name&gt;configuration&lt;/name&gt;
-      &lt;description&gt;description&lt;/description&gt;
-      &lt;object type="org.exoplatform.services.organization.impl.NewUserConfig"&gt;
-        &lt;field  name="group"&gt;
-          &lt;collection type="java.util.ArrayList"&gt;
-            &lt;value&gt;
-              &lt;object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup"&gt;
-                &lt;field name="groupId"&gt;&lt;string&gt;/user&lt;/string&gt;&lt;/field&gt;
-                &lt;field name="membership"&gt;&lt;string&gt;member&lt;/string&gt;&lt;/field&gt;
-              &lt;/object&gt;
-            &lt;/value&gt;               
-          &lt;/collection&gt;
-        &lt;/field&gt;
-        &lt;field  name="ignoredUser"&gt;
-          &lt;collection type="java.util.HashSet"&gt;
-            &lt;value&gt;&lt;string&gt;exo&lt;/string&gt;&lt;/value&gt;
-            &lt;value&gt;&lt;string&gt;root&lt;/string&gt;&lt;/value&gt;
-            &lt;value&gt;&lt;string&gt;company&lt;/string&gt;&lt;/value&gt;
-            &lt;value&gt;&lt;string&gt;community&lt;/string&gt;&lt;/value&gt;
-          &lt;/collection&gt;
-        &lt;/field&gt;
-      &lt;/object&gt;
-    &lt;/object-param&gt;
-  &lt;/init-params&gt;
-&lt;/component-plugin&gt;
+<programlisting role="XML">&#60;component-plugin&#62;
+  &#60;name&#62;new.user.event.listener&#60;/name&#62;
+  &#60;set-method&#62;addListenerPlugin&#60;/set-method&#62;
+  &#60;type&#62;org.exoplatform.services.organization.impl.NewUserEventListener&#60;/type&#62;
+  &#60;description&#62;this listener assign group and membership to a new created user&#60;/description&#62;
+  &#60;init-params&#62;
+    &#60;object-param&#62;
+      &#60;name&#62;configuration&#60;/name&#62;
+      &#60;description&#62;description&#60;/description&#62;
+      &#60;object type=&#34;org.exoplatform.services.organization.impl.NewUserConfig&#34;&#62;
+        &#60;field  name=&#34;group&#34;&#62;
+          &#60;collection type=&#34;java.util.ArrayList&#34;&#62;
+            &#60;value&#62;
+              &#60;object type=&#34;org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup&#34;&#62;
+                &#60;field name=&#34;groupId&#34;&#62;&#60;string&#62;/user&#60;/string&#62;&#60;/field&#62;
+                &#60;field name=&#34;membership&#34;&#62;&#60;string&#62;member&#60;/string&#62;&#60;/field&#62;
+              &#60;/object&#62;
+            &#60;/value&#62;               
+          &#60;/collection&#62;
+        &#60;/field&#62;
+        &#60;field  name=&#34;ignoredUser&#34;&#62;
+          &#60;collection type=&#34;java.util.HashSet&#34;&#62;
+            &#60;value&#62;&#60;string&#62;exo&#60;/string&#62;&#60;/value&#62;
+            &#60;value&#62;&#60;string&#62;root&#60;/string&#62;&#60;/value&#62;
+            &#60;value&#62;&#60;string&#62;company&#60;/string&#62;&#60;/value&#62;
+            &#60;value&#62;&#60;string&#62;community&#60;/string&#62;&#60;/value&#62;
+          &#60;/collection&#62;
+        &#60;/field&#62;
+      &#60;/object&#62;
+    &#60;/object-param&#62;
+  &#60;/init-params&#62;
+&#60;/component-plugin&#62;
 </programlisting>
 	</section>
 

Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Skin_Configuration">
 	<title>Skin Configuration</title>
@@ -30,7 +28,7 @@
 	<section id="sect-Reference_Guide-Skin_Configuration-Skins_in_Page_Markups">
 		<title>Skins in Page Markups</title>
 		<para>
-			A &PRODUCT; skin contains css styles for the portal's components but also shares components that may be reused in portlets. When &PRODUCT; generates a portal page markup, it inserts stylesheet links in the page's <literal>head</literal> tag.
+			A &PRODUCT; skin contains css styles for the portal&#39;s components but also shares components that may be reused in portlets. When &PRODUCT; generates a portal page markup, it inserts stylesheet links in the page&#39;s <literal>head</literal> tag.
 		</para>
 		<para>
 			In the snipped code below you can see two types of links:
@@ -40,21 +38,21 @@
 				<area coords="3" id="area-Reference_Guide-Skin_Configuration-Coreskin" />
 				<area coords="4" id="area-Reference_Guide-Skin_Configuration-Stylesheets" />
 			</areaspec>
-<programlisting>&lt;head&gt;
+			
+<programlisting>&#60;head&#62;
 ...   
-&lt;link id="CoreSkin" rel="stylesheet" type="text/css" href="/eXoResources/skin/Stylesheet.css" /&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;
+&#60;link id=&#34;CoreSkin&#34; rel=&#34;stylesheet&#34; type=&#34;text/css&#34; href=&#34;/eXoResources/skin/Stylesheet.css&#34; /&#62;
+&#60;link id=&#34;web_FooterPortlet&#34; rel=&#34;stylesheet&#34; type=&#34;text/css&#34; href= &#34;/web/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css&#34; /&#62;
+&#60;link id=&#34;web_NavigationPortlet&#34; rel=&#34;stylesheet&#34; type=&#34;text/css&#34; href= &#34;/web/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css&#34; /&#62;
+&#60;link id=&#34;web_HomePagePortlet&#34; rel=&#34;stylesheet&#34; type=&#34;text/css&#34; href= &#34;/portal/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet.css&#34; /&#62;
+&#60;link id=&#34;web_BannerPortlet&#34; rel=&#34;stylesheet&#34; type=&#34;text/css&#34; href= &#34;/web/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css&#34; /&#62;
 ...
-&lt;/head&gt;
+&#60;/head&#62;
 </programlisting>
-
-		<calloutlist>
+			<calloutlist>
 				<callout arearefs="area-Reference_Guide-Skin_Configuration-Coreskin">
 					<para>
-						Portal skin stylesheet (<literal>id="CoreSkin"</literal>).
+						Portal skin stylesheet (<literal>id=&#34;CoreSkin&#34;</literal>).
 					</para>
 				</callout>
 				<callout arearefs="area-Reference_Guide-Skin_Configuration-Stylesheets">
@@ -62,39 +60,40 @@
 						Portlets skin stylesheets (<emphasis role="bold">all others</emphasis>). Each portlet within the page may contribute its own style(s).
 					</para>
 				</callout>
-		</calloutlist>
+			</calloutlist>
 		</programlistingco>
+
 	</section>
 	
 	<section id="sect-Reference_Guide-Skin_Configuration-Types_of_Styles">
 		<title>Types of Styles</title>
-			<para>
-				The portal skin is typically made of 3 types of styles:
-			</para>
+		<para>
+			The portal skin is typically made of 3 types of styles:
+		</para>
 		<variablelist>
 			<varlistentry>
 				<term>Portlet themes</term>
-					<listitem>
-						<para>
-							 Decorations for portlet windows.
-						</para>
-					</listitem>
+				<listitem>
+					<para>
+						Decorations for portlet windows.
+					</para>
+				</listitem>
 			</varlistentry>
 			<varlistentry>
 				<term>Portal styles</term>
-					<listitem>
-						<para>
-							 Default styles for html tags (ex div,th,td...) and the portal UI (including the sidebar and portal admin screens).
-						</para>
-					</listitem>
+				<listitem>
+					<para>
+						Default styles for html tags (ex div,th,td...) and the portal UI (including the sidebar and portal admin screens).
+					</para>
+				</listitem>
 			</varlistentry>
 			<varlistentry>
 				<term>Shared styles</term>
-					<listitem>
-						<para>
-							&PRODUCT; WebUI components styles are reused among different portlets.
-						</para>
-					</listitem>
+				<listitem>
+					<para>
+						&PRODUCT; WebUI components styles are reused among different portlets.
+					</para>
+				</listitem>
 			</varlistentry>
 		</variablelist>
 		<para>
@@ -113,11 +112,9 @@
 			Portlets often require additionnal 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>. For example: <literal>ContentPortlet</literal> in <literal>content.war</literal>, will give <parameter>id=&#34;content<literal>ContentPortlet&#34;</literal></parameter>
 		</para>
-
-<!-- #################### TODO: give some rules to follow in order to avoid overriding portal styles #####################-->
-
+		<!--  #################### TODO: give some rules to follow in order to avoid overriding portal styles ##################### -->
 	</section>
 	
 	<section id="sect-Reference_Guide-Skin_Configuration-How_to_Configure_a_Portal_Skin">
@@ -132,18 +129,18 @@
    * Register the stylesheet for a portal Skin.
    * @param module skin module identifier
    * @param skinName skin name
-   * @param cssPath path uri to the css file. This is relative to the root context, use leading '/'
-   * @param scontext the webapp's {@link ServletContext}
+   * @param cssPath path uri to the css file. This is relative to the root context, use leading &#39;/&#39;
+   * @param scontext the webapp&#39;s {@link ServletContext}
    */
   public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext) {
     [...]
   }
   /**
    * Register a portlet stylesheet for a Skin.
-   * @param module skin module. Typically of the form 'portletAppName/portletName' .
+   * @param module skin module. Typically of the form &#39;portletAppName/portletName&#39; .
    * @param skinName Name of the skin
-   * @param cssPath path uri to the css file. This is relative to the root context, use leading '/'
-   * @param scontext the webapp's {@link ServletContext}
+   * @param cssPath path uri to the css file. This is relative to the root context, use leading &#39;/&#39;
+   * @param scontext the webapp&#39;s {@link ServletContext}
    */
   public void addSkin(String module, String skinName, String cssPath, ServletContext scontext) {
     [...]
@@ -162,7 +159,7 @@
    * @param categoryName portlet theme category
    * @param themesName names of the themes
    */
-  public void addTheme(String categoryName, List&lt;String&gt; themesName) {
+  public void addTheme(String categoryName, List&#60;String&#62; themesName) {
     [...]
   }
 </programlisting>
@@ -177,13 +174,13 @@
 				&PRODUCT; provides a servlet listener that allows you to register your own skins and styles when your webapp starts up. The first step is to add the listener to your portlet app <literal>web.xml</literal>.
 			</para>
 			
-<programlisting role="XML">&lt;web-app&gt;
+<programlisting role="XML">&#60;web-app&#62;
     [::]
-    &lt;listener&gt;
-      &lt;listener-class&gt;org.exoplatform.portal.webui.skin.SkinConfigListener&lt;/listener-class&gt;
-    &lt;/listener&gt;
+    &#60;listener&#62;
+      &#60;listener-class&#62;org.exoplatform.portal.webui.skin.SkinConfigListener&#60;/listener-class&#62;
+    &#60;/listener&#62;
     [::]
-  &lt;/web-app&gt;
+  &#60;/web-app&#62;
 </programlisting>
 		</section>
 		
@@ -196,21 +193,21 @@
 				This script allows full access to the <literal>SkinService</literal> and <literal>ServletContext</literal> which are bound as scripting variables under the same name. The following script is an example. It can be found in the <literal>GateInResources.war</literal> and is used by &PRODUCT; to register the <literal>Default</literal> portal skin and some portlet themes.
 			</para>
 			
-<programlisting>SkinService.addPortalSkin("CoreSkin","Default", "/GateInResources/skin/Stylesheet.css", ServletContext);
-SkinService.addTheme("Simple", ["SimpleBlue","SimpleViolet","SimpleOrange","SimplePink","SimpleGreen"]);
-SkinService.addTheme("RoundConer", ["RoundConerBlue","RoundConerViolet","RoundConerOrange","RoundConerPink","RoundConerGreen"]);
-SkinService.addTheme("Shadow", ["ShadowBlue","ShadowViolet","ShadowOrange","ShadowPink","ShadowGreen"]);
-SkinService.addTheme("MacStyle", ["MacTheme","MacGray","MacGreenSteel","MacBlack"]);
-SkinService.addTheme("VistaStyle", ["VistaTheme","VistaBlue"]);
+<programlisting>SkinService.addPortalSkin(&#34;CoreSkin&#34;,&#34;Default&#34;, &#34;/GateInResources/skin/Stylesheet.css&#34;, ServletContext);
+SkinService.addTheme(&#34;Simple&#34;, [&#34;SimpleBlue&#34;,&#34;SimpleViolet&#34;,&#34;SimpleOrange&#34;,&#34;SimplePink&#34;,&#34;SimpleGreen&#34;]);
+SkinService.addTheme(&#34;RoundConer&#34;, [&#34;RoundConerBlue&#34;,&#34;RoundConerViolet&#34;,&#34;RoundConerOrange&#34;,&#34;RoundConerPink&#34;,&#34;RoundConerGreen&#34;]);
+SkinService.addTheme(&#34;Shadow&#34;, [&#34;ShadowBlue&#34;,&#34;ShadowViolet&#34;,&#34;ShadowOrange&#34;,&#34;ShadowPink&#34;,&#34;ShadowGreen&#34;]);
+SkinService.addTheme(&#34;MacStyle&#34;, [&#34;MacTheme&#34;,&#34;MacGray&#34;,&#34;MacGreenSteel&#34;,&#34;MacBlack&#34;]);
+SkinService.addTheme(&#34;VistaStyle&#34;, [&#34;VistaTheme&#34;,&#34;VistaBlue&#34;]);
 </programlisting>
 			<para>
 				The syntax of addTheme() is: 
-<programlisting>addTheme(String categoryName, List&lt;String&gt; themesName)
+<programlisting>addTheme(String categoryName, List&#60;String&#62; themesName)
 </programlisting>
 			</para>
 			<para>
 				So, to provide your own skin you could use the following: 
-<programlisting>SkinService.addSkin("mywebapp/MyPortlet", "MyPortalSkin", "/mywebapp/skin/Stylesheet.css", ServletContext);
+<programlisting>SkinService.addSkin(&#34;mywebapp/MyPortlet&#34;, &#34;MyPortalSkin&#34;, &#34;/mywebapp/skin/Stylesheet.css&#34;, ServletContext);
 </programlisting>
 			</para>
 			<para>
@@ -222,13 +219,13 @@
 </programlisting>
 			</para>
 			<para>
-				'<literal>overwrite</literal>' is optional, its default value is "<parameter>false</parameter>". If its value is <parameter>true</parameter>, the later call of <parameter>addSkin()</parameter> for the same skin key (combination of module + skinName) replaces the skin of the previous call.
+				&#39;<literal>overwrite</literal>&#39; is optional, its default value is &#34;<parameter>false</parameter>&#34;. If its value is <parameter>true</parameter>, the later call of <parameter>addSkin()</parameter> for the same skin key (combination of module + skinName) replaces the skin of the previous call.
 			</para>
 			<para>
 				Similarly, use the following to configure a particular portal:
 			</para>
 			
-<programlisting>SkinService.addSkin("myportalname", "skin", "/path/to/skin/Stylesheet.css", ServletContext);
+<programlisting>SkinService.addSkin(&#34;myportalname&#34;, &#34;skin&#34;, &#34;/path/to/skin/Stylesheet.css&#34;, ServletContext);
 </programlisting>
 			<para>
 				The syntax of addPortalSkin() is: 
@@ -241,7 +238,7 @@
 	
 	<section id="sect-Reference_Guide-Skin_Configuration-Tips_and_Tricks">
 		<title>Tips and Tricks</title>
-		<section id="sect-Reference_Guide-Tips_and_Tricks-Easier_css_debuggin">
+		<section id="sect-Reference_Guide-Tips_and_Tricks-Easier_css_debugging">
 			<title>Easier css debugging</title>
 			<para>
 				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.
@@ -250,7 +247,7 @@
 				The <literal>ServletContext</literal> parameter allows direct access to the CSS files from the <literal>SkinService</literal>. The optimization code is quite simple as all the CSS files are parsed at the server startup time and all the @import and url(...) 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 environments, it may be easier to deactivate this optimization while debugging  stylesheets. To do so, set the java system property <literal>exo.product.developing</literal> to <literal>true</literal>.
+				Although the optimization is useful for a production environments, it may be easier to deactivate this optimization while debugging stylesheets. To do so, set the java system property <literal>exo.product.developing</literal> to <literal>true</literal>.
 			</para>
 			<para>
 				For example, the property can passed as a JVM parameter with the <literal>-D</literal> option in the <literal>GateIn.sh</literal> startup script: {code} EXO{code}
@@ -258,13 +255,13 @@
 			<orderedlist numeration="arabic">
 				<listitem>
 					<para>
-						warning("This is option may cause display bugs with certain browsers like Internet Explorer")
+						warning(&#34;This is option may cause display bugs with certain browsers like Internet Explorer&#34;)
 					</para>
 				</listitem>
 			</orderedlist>
 		</section>
 		
-		<section id="sect-Reference_Guide-Tips_and_Tricks-Change_portlet_icons">
+		<section id="sect-Reference_Guide-Tips_and_Tricks-_Change_portlet_icons_">
 			<title> Change portlet icons </title>
 			<para>
 				Each portlet is represented by an icon that you can see in the portlet registry, or the webos dock. This icon can be changed by adding an image to the directory:
@@ -272,7 +269,7 @@
 			<itemizedlist>
 				<listitem>
 					<para>
-						<filename>$project/portlet/myportlets/src/main/webapp/skin/DefaultSkin/portletIcons<replaceable>icon_name.png</replaceable></filename>. To be used correctly the icon must be named after the portlet. 
+						<filename>$project/portlet/myportlets/src/main/webapp/skin/DefaultSkin/portletIcons<replaceable>icon_name.png</replaceable></filename>. To be used correctly the icon must be named after the portlet.
 					</para>
 				</listitem>
 			</itemizedlist>
@@ -294,13 +291,13 @@
 				The default skin of portal is called Default. To change this value (to a Mac-like skin, a Windows Vista-like skin, or an original skin), add a skin tag in the <literal>portal.xml</literal> that defines your portal:
 			</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;Mac&lt;/skin&gt;
-  &lt;creator&gt;root&lt;/creator&gt;
+<programlisting role="XML">&#60;portal-config&#62;
+  &#60;portal-name&#62;classic&#60;/portal-name&#62;
+  &#60;locale&#62;en&#60;/locale&#62;
+  &#60;access-permissions&#62;Everyone&#60;/access-permissions&#62;
+  &#60;edit-permission&#62;*:/platform/administrators&#60;/edit-permission&#62;
+  &#60;skin&#62;Mac&#60;/skin&#62;
+  &#60;creator&#62;root&#60;/creator&#62;
 ...
 </programlisting>
 		</section>
@@ -308,10 +305,10 @@
 		<section id="sect-Reference_Guide-Tips_and_Tricks-Some_CSS_techniques">
 			<title>Some CSS techniques</title>
 			<para>
-				It is recommended that users have some experience with CSS before studying &PRODUCT; CSS. ALso, pleased read the CSS specification at <ulink type="http" url="http://www.w3.org/TR/REC-CSS2/selector.html"></ulink>
+				It is recommended that users have some experience with CSS before studying &PRODUCT; CSS. ALso, pleased read the CSS specification at <ulink type="http" url="http://www.w3.org/TR/REC-CSS2/selector.html" />
 			</para>
 			<para>
-				&PRODUCT; relies heavily on CSS to create the layout and effects for the UI. Some common techniques for customizing &PRODUCT;'s CSS are explained below. 
+				&PRODUCT; relies heavily on CSS to create the layout and effects for the UI. Some common techniques for customizing &PRODUCT;&#39;s CSS are explained below.
 			</para>
 			<section id="sect-Reference_Guide-Some_CSS_techniques-Decorator_pattern">
 				<title>Decorator pattern</title>
@@ -333,23 +330,23 @@
 | BottomLeft |              BottomCenter                | BottomRight |
 |            |                                          |             |
 -----------------------------------------------------------------------
-&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;
+&#60;div class=&#34;Parent&#34;&#62;
+  &#60;div class=&#34;TopLeft&#34;&#62;
+    &#60;div class=&#34;TopRight&#34;&#62;
+      &#60;div class=&#34;TopCenter&#34;&#62;&#60;span&#62;&#60;/span&#62;&#60;/div&#62;
+    &#60;/div&#62;
+  &#60;/div&#62;
+  &#60;div class=&#34;CenterLeft&#34;&#62;
+    &#60;div class=&#34;CenterRight&#34;&#62;
+      &#60;div class=&#34;CenterCenter&#34;&#62;BODY&#60;/div&#62;
+    &#60;/div&#62;
+  &#60;/div&#62;
+  &#60;div class=&#34;BottomLeft&#34;&#62;
+    &#60;div class=&#34;BottomRight&#34;&#62;
+      &#60;div class=&#34;BottomCenter&#34;&#62;&#60;span&#62;&#60;/span&#62;&#60;/div&#62;
+    &#60;/div&#62;
+  &#60;div&#62;
+&#60;/div&#62;
 </programlisting>
 			</section>
 			
@@ -362,18 +359,18 @@
 <programlisting role="HTML">
 |                         |                                                |      
 |                         |                                                |      
-| |&lt;--- fixed width ---&gt;| |                   will expand to right ----&gt;   |      
+| |&#60;--- fixed width ---&#62;| |                   will expand to right ----&#62;   |      
 |                         |                                                |      
 |                         |                                                |      
 |                         |                                                |      
 ----
-&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;
+&#60;div class=&#34;Parent&#34;&#62;
+  &#60;div style=&#34;float: left; width: 100px&#34;&#62;
+  &#60;/div&#62;
+  &#60;div style=&#34;margin-left: 105px;&#34;&#62;
+  &#60;div&#62;
+  &#60;div style=&#34;clear: left&#34;&#62;&#60;span&#62;&#60;/span&#62;&#60;/div&#62;
+&#60;/div&#62;
 </programlisting>
 			</section>
 
@@ -388,21 +385,21 @@
 				<para>
 					Define the new skin in the <literal>WEB-INF/conf/script/groovy/SkinConfigScript.groovy</literal> file as a <literal>Resource</literal> (for example, in the project <replaceable>MyPortal</replaceable>, the resource would read; <literal>GateInResourcesMyPortal</literal>).
 				</para>
-<warning>
-<para>
-	The <literal>WEB-INF/conf/script/groovy/SkinConfigScript.groovy</literal> file mentioned above does not exist in EPP-5.0.ER2. The closest match is <literal>./jboss-as/server/default/tmp/<replaceable>instance</replaceable>/02portal.war/WEB-INF/conf/uiconf/portal/webui/portal/SkinConfigOption.groovy
-</literal> 
-</para>
-</warning>
+				<warning>
+					<para>
+						The <literal>WEB-INF/conf/script/groovy/SkinConfigScript.groovy</literal> file mentioned above does not exist in EPP-5.0.ER2. The closest match is <literal>./jboss-as/server/default/tmp/<replaceable>instance</replaceable>/02portal.war/WEB-INF/conf/uiconf/portal/webui/portal/SkinConfigOption.groovy </literal>
+					</para>
+				</warning>
+				
 <programlisting>
-SkinService.addPortalSkin("MyPortalSkin","MyPortal","/GateInResourcesMyPortal/skin/Stylesheet.css",ServletContext);
+SkinService.addPortalSkin(&#34;MyPortalSkin&#34;,&#34;MyPortal&#34;,&#34;/GateInResourcesMyPortal/skin/Stylesheet.css&#34;,ServletContext);
 </programlisting>
 			</step>
 			<step>
 				<para>
 					Place the new skin files into the <replaceable>skinyourSkin</replaceable> folder and create a new <literal>Stylesheet.css</literal> file in the same directory. This file should include lines to import all links to your CSS. For example in <replaceable>MyPortal</replaceable> project:
-			</para>
-		
+				</para>
+				
 <programlisting>
 @import url(MyPortalSkin/portal/webui/component/UIPortalApplicationSkin.css) ;
 @import url(MyPortalSkin/webui/component/Stylesheet.css) ;
@@ -411,26 +408,24 @@
 			<step>
 				<para>
 					Finally, define the name of new skin and the image preview for the <emphasis>Skin Settings</emphasis> action. The image preview can be set in the file:<filename>ressource/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/Stylesheet.css</filename>
-
 <programlisting>
 .UIChangeSkinForm .UIItemSelector .TemplateContainer .MyPortalImage {
 	margin: auto;
 	width: 329px; height:204px;
-	background: url('background/MyPortal.jpg') no-repeat top;
+	background: url(&#39;background/MyPortal.jpg&#39;) no-repeat top;
 	cursor: pointer ;
 }
 </programlisting>
 				</para>
 				<para>
-					If no name is set for the new skin, it will be named <literal>label&gt;</literal>. The skin name is defined in the <literal>./jboss-as/server/default/tmp<replaceable>instance</replaceable>/<replaceable>resource</replaceable>/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/Stylesheet.css</literal>.
+					If no name is set for the new skin, it will be named <literal>label&#62;</literal>. The skin name is defined in the <literal>./jboss-as/server/default/tmp<replaceable>instance</replaceable>/<replaceable>resource</replaceable>/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/Stylesheet.css</literal>.
 				</para>
-<warning>
-<para>
-	The program listing below is in French. This should be translated into en-US before publication.
-</para>
-</warning>
-		
-
+				<warning>
+					<para>
+						The program listing below is in French. This should be translated into en-US before publication.
+					</para>
+				</warning>
+				
 <programlisting>
 #############################################################################
 #                              Change Skin                                  #
@@ -446,7 +441,6 @@
 Skin.title=Liste des styles
 Skin.left.title=Voir et s?lectionner un style
 </programlisting>
-
 			</step>
 			<step>
 				<para>
@@ -454,31 +448,34 @@
 				</para>
 			</step>
 		</procedure>
+
 	</section>
 	
 	<section id="sect-Reference_Guide-Skin_Configuration-How_to_create_new_themes">
 		<title>How to create new themes</title>
-			<procedure>		
-				<step>
-					<para>
-						Define the new theme in <literal>WEB-INF/conf/script/groovy/SkinConfigScript.groovy</literal> in your <literal>Resource</literal> (for example, in the project MyPortal: <literal>GateInResourcesCp060508</literal>).
-					</para>
-<programlisting>SkinService.addTheme("MyPortal-MacTheme", ["MacGray","MacBlue","MacBlack"]);
+		<procedure>
+			<step>
+				<para>
+					Define the new theme in <literal>WEB-INF/conf/script/groovy/SkinConfigScript.groovy</literal> in your <literal>Resource</literal> (for example, in the project MyPortal: <literal>GateInResourcesCp060508</literal>).
+				</para>
+				
+<programlisting>SkinService.addTheme(&#34;MyPortal-MacTheme&#34;, [&#34;MacGray&#34;,&#34;MacBlue&#34;,&#34;MacBlack&#34;]);
 </programlisting>
-				</step>
-				<step>
-					<para>
-						Place new theme files into <literal>folder skinyourSkin</literal> and create a new <literal>Stylesheet.css</literal> file in the same directory. This file should include lines to import all links to all CSS resources. For example, in the <replaceable>MyPortal</replaceable> project:
-					</para>
-			
+			</step>
+			<step>
+				<para>
+					Place new theme files into <literal>folder skinyourSkin</literal> and create a new <literal>Stylesheet.css</literal> file in the same directory. This file should include lines to import all links to all CSS resources. For example, in the <replaceable>MyPortal</replaceable> project:
+				</para>
+				
 <programlisting>@import url(MyPortalSkin/PortletThemes/Stylesheet.css) ;
 </programlisting>
-				</step>
-			</procedure>
-			<para>
-				The code below illustrates the inclusion of all CSS resoucres for a new theme from the example file <literal>GateInResourcesCp060508/skin/MyPortalSkin/PortletThemes/Stylesheet.css</literal>.
-			</para>
+			</step>
+		</procedure>
 		
+		<para>
+			The code below illustrates the inclusion of all CSS resoucres for a new theme from the example file <literal>GateInResourcesCp060508/skin/MyPortalSkin/PortletThemes/Stylesheet.css</literal>.
+		</para>
+		
 <programlisting>
 /*---- MyPortalTheme ----*/
 .MyPortalTheme .WindowBarCenter .WindowPortletInfo {
@@ -491,7 +488,7 @@
 	width: 24px; 
 	height: 17px;
 	cursor: pointer;
-	background-image: url('background/MyPortalTheme.png');
+	background-image: url(&#39;background/MyPortalTheme.png&#39;);
 }
 .MyPortalTheme .ArrowDownIcon {
 	background-position: center 20px;
@@ -528,8 +525,8 @@
 	float: left;/* orientation=rt */
 	width: 18px; height: 18px;
 	cursor: nw-resize;
-	background: url('background/ResizeArea18x18.gif') no-repeat left top; /* orientation=lt */
-	background: url('background/ResizeArea18x18-rt.gif') no-repeat right top; /* orientation=rt */
+	background: url(&#39;background/ResizeArea18x18.gif&#39;) no-repeat left top; /* orientation=lt */
+	background: url(&#39;background/ResizeArea18x18-rt.gif&#39;) no-repeat right top; /* orientation=rt */
 }
 .MyPortalTheme .Information {
 	height: 18px; line-height: 18px;
@@ -556,18 +553,18 @@
 }
 .MyPortalTheme .WindowBarLeft {
 	padding-left: 12px;
-	background-image: url('background/MyPortalTheme.png');
+	background-image: url(&#39;background/MyPortalTheme.png&#39;);
 	background-repeat: no-repeat;
 	background-position: left -148px;
 }
 .MyPortalTheme .WindowBarRight {
 	padding-right: 11px;
-	background-image: url('background/MyPortalTheme.png');
+	background-image: url(&#39;background/MyPortalTheme.png&#39;);
 	background-repeat: no-repeat;
 	background-position: right -119px;
 }
 .MyPortalTheme .WindowBarCenter {
-	background-image: url('background/MyPortalTheme.png');
+	background-image: url(&#39;background/MyPortalTheme.png&#39;);
 	background-repeat: repeat-x;
 	background-position: left -90px;
 }
@@ -577,29 +574,29 @@
 }
 .MyPortalTheme .MiddleDecoratorLeft {
 	padding-left: 12px;
-	background: url('background/MMyPortalTheme.png') repeat-y left;
+	background: url(&#39;background/MMyPortalTheme.png&#39;) repeat-y left;
 }
 .MyPortalTheme .MiddleDecoratorRight {
 	padding-right: 11px;
-	background: url('background/MMyPortalTheme.png') repeat-y right;
+	background: url(&#39;background/MMyPortalTheme.png&#39;) repeat-y right;
 }
 .MyPortalTheme .MiddleDecoratorCenter {
 	background: #ffffff;
 }
 .MyPortalTheme .BottomDecoratorLeft {
 	padding-left: 12px;
-	background-image: url('background/MyPortalTheme.png');
+	background-image: url(&#39;background/MyPortalTheme.png&#39;);
 	background-repeat: no-repeat;
 	background-position: left -60px;
 }
 .MyPortalTheme .BottomDecoratorRight {
 	padding-right: 11px;
-	background-image: url('background/MyPortalTheme.png');
+	background-image: url(&#39;background/MyPortalTheme.png&#39;);
 	background-repeat: no-repeat;
 	background-position: right -30px;
 }
 .MyPortalTheme .BottomDecoratorCenter {
-	background-image: url('background/MyPortalTheme.png');
+	background-image: url(&#39;background/MyPortalTheme.png&#39;);
 	background-repeat: repeat-x;
 	background-position: left top;
 }
@@ -607,7 +604,6 @@
 	height: 30px;
 }
 </programlisting>
-
 	</section>
 
 </section>

Modified: portal/trunk/docs/reference-guide/en/modules/development/Accessing_User_Profile.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/development/Accessing_User_Profile.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/development/Accessing_User_Profile.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Accessing_User_Profile">
 	<title>Accessing User Profile</title>

Modified: portal/trunk/docs/reference-guide/en/modules/development/Ajax_Loading_Mask_Layer_Deactivation.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/development/Ajax_Loading_Mask_Layer_Deactivation.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/development/Ajax_Loading_Mask_Layer_Deactivation.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,11 +1,9 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Deactivation_of_the_Ajax_Loading_Mask_Layer_">
 	<title>Deactivation of the Ajax Loading Mask Layer </title>
-<!--	<section id="sect-Reference_Guide-Deactivation_of_the_Ajax_Loading_Mask_Layer_-Overview">
+	<!-- 	<section id="sect-Reference_Guide-Deactivation_of_the_Ajax_Loading_Mask_Layer_-Overview">
 		<title>Overview</title>
 		<para>
 			In this article, you will learn:
@@ -27,46 +25,46 @@
 				</para>
 			</listitem>
 		</itemizedlist>
-	</section> -->
-	
-	<section id="sect-Reference_Guide-Deactivation_of_the_Ajax_Loading_Mask_Layer_-Purpose_of_requirement">
+	</section>  -->
+	<section id="sect-Reference_Guide-Deactivation_of_the_Ajax_Loading_Mask_Layer_-Purpose">
 		<title>Purpose</title>
-			<para>
-				The loading mask layer is deployed after an ajax-call. Its purpose is to block the GUI in order to prevent further user actions until the the ajax-request has been completed.
-			</para>
-			<para>
-				However, the mask layer may need to be deactivated in instances where the portal requires user instructions before previous instructions have been carried out.
-			</para>
-			<procedure>
-				<title>How to deactivate the ajax-loading mask</title>
-					<step>
-						<para>
-							Generate a script to make an asynchronous ajax-call. Use the <literal>uicomponent.doAsync()</literal> method rather than the <literal>uicomponent.event()</literal> method.
-						</para>
-						<para>
-							For example:
-						</para>
-		
-<programlisting>&lt;a href="&lt;%=uicomponent.doAsync(action, beanId, params)%&gt;" alt=""&gt;Asynchronous&lt;/a&gt;
+		<para>
+			The loading mask layer is deployed after an ajax-call. Its purpose is to block the GUI in order to prevent further user actions until the the ajax-request has been completed.
+		</para>
+		<para>
+			However, the mask layer may need to be deactivated in instances where the portal requires user instructions before previous instructions have been carried out.
+		</para>
+		<procedure id="proc-Reference_Guide-Purpose-How_to_deactivate_the_ajax_loading_mask">
+			<title>How to deactivate the ajax-loading mask</title>
+			<step>
+				<para>
+					Generate a script to make an asynchronous ajax-call. Use the <literal>uicomponent.doAsync()</literal> method rather than the <literal>uicomponent.event()</literal> method.
+				</para>
+				<para>
+					For example:
+				</para>
+				
+<programlisting>&#60;a href=&#34;&#60;%=uicomponent.doAsync(action, beanId, params)%&#62;&#34; alt=&#34;&#34;&#62;Asynchronous&#60;/a&#62;
 </programlisting>
-					</step>
-					<step>
-						<para>
-							The <literal>doAsync()</literal> method automatically adds the following new parameter into the parameters list; <literal>asyncparam = new Parameter(AJAX ASYNC,"true"); (AJAX ASYNC == "ajax async")</literal>
-						</para>
-						<para>
-							This request is asynchronous and the ajax-loading mask will not deployed.
-						</para>
-						<note>
-							<para>
-								An asynchronous request can still be made using the <literal>uicomponent.event()</literal>. When using this method, however, the asyncparam must be added manually.
-							</para>
-						</note>
-					</step>
-			</procedure>
-			<para>
-				The GUI will be blocked to ensure a user can only request one action at a time and while the request seems to be synchronous, all ajax requests are, in fact always asynchronous. For further information refer to <xref linkend="sect-Reference_Guide-Deactivation_of_the_Ajax_Loading_Mask_Layer_-Synchronous_issue"/>.
-			</para>
+			</step>
+			<step>
+				<para>
+					The <literal>doAsync()</literal> method automatically adds the following new parameter into the parameters list; <literal>asyncparam = new Parameter(AJAX ASYNC,&#34;true&#34;); (AJAX ASYNC == &#34;ajax async&#34;)</literal>
+				</para>
+				<para>
+					This request is asynchronous and the ajax-loading mask will not deployed.
+				</para>
+				<note>
+					<para>
+						An asynchronous request can still be made using the <literal>uicomponent.event()</literal>. When using this method, however, the asyncparam must be added manually.
+					</para>
+				</note>
+			</step>
+		</procedure>
+		
+		<para>
+			The GUI will be blocked to ensure a user can only request one action at a time and while the request seems to be synchronous, all ajax requests are, in fact always asynchronous. For further information refer to <xref linkend="sect-Reference_Guide-Deactivation_of_the_Ajax_Loading_Mask_Layer_-Synchronous_issue" />.
+		</para>
 	</section>
 	
 	<section id="sect-Reference_Guide-Deactivation_of_the_Ajax_Loading_Mask_Layer_-Synchronous_issue">
@@ -81,18 +79,16 @@
 		<para>
 			However, in order to work with browsers that do not support <emphasis>Synchronous</emphasis> requests, <literal>bAsync</literal> is set to always be true (Ajax request will always be asynchronous).
 		</para>
-<!--		
+		<!-- 		
 <programlisting>var bAsync = false; // Synchronous
 request.open(instance.method, instance.url, bAsync); // Firefox will not execute
 </programlisting>
 		<para>
 			So 
-		</para> -->
-		
+		</para>  -->
 <programlisting>// Asynchronous request
 request.open(instance.method, instance.url, true);
 </programlisting>
-
 	</section>
 
 </section>

Modified: portal/trunk/docs/reference-guide/en/modules/development/Dynamic_Layouts.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/development/Dynamic_Layouts.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/development/Dynamic_Layouts.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Dynamic_Layouts">
 	<title>Dynamic Layouts</title>

Modified: portal/trunk/docs/reference-guide/en/modules/development/Internationalization_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/development/Internationalization_Configuration.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/development/Internationalization_Configuration.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Internationalization_Configuration">
 	<title>Internationalization Configuration</title>
@@ -10,13 +8,12 @@
 		<note>
 			<title>Assumed Knowledge</title>
 			<para>
-				&PRODUCT; is fully configurable for internationalization, however users should have a general knowledge of Internationalization in Java products before attempting these configurations. 
+				&PRODUCT; is fully configurable for internationalization, however users should have a general knowledge of Internationalization in Java products before attempting these configurations.
 			</para>
 			<para>
-				Sun Java hosts a comprehensive guide to internationalizing java products at <ulink url="http://java.sun.com/docs/books/tutorial/i18n/TOC.html"></ulink>.
+				Sun Java hosts a comprehensive guide to internationalizing java products at <ulink url="http://java.sun.com/docs/books/tutorial/i18n/TOC.html" />.
 			</para>
 		</note>
-
 		<para>
 			All &PRODUCT; applications contain property files for various languages. They are packaged with the portlets applications in a <filename>WEB-INF/classes/locale/</filename> directory.
 		</para>
@@ -46,7 +43,7 @@
 <programlisting>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>. 
+			There are also properties files in the portal itself. They form the <emphasis role="bold">portal resource bundle</emphasis>.
 		</para>
 		<para>
 			From a portlet you can then access translations from the portlet itself or shared at the portal level, both are aggregated when you need them.
@@ -54,7 +51,7 @@
 		<note>
 			<title>Translation in XML format</title>
 			<para>
-				It is also possible to use a proprietary XML format to define translations. This is a more convenient way to translate a document for some languages such as Japanese, Arabic or Russian. Property files have te be ASCII encoded, while the XML file can define its encoding. As a result it's easier for a human being to read (and fix) a translation in XML instead of having to decode and encode the property file.
+				It is also possible to use a proprietary XML format to define translations. This is a more convenient way to translate a document for some languages such as Japanese, Arabic or Russian. Property files have te be ASCII encoded, while the XML file can define its encoding. As a result it&#39;s easier for a human being to read (and fix) a translation in XML instead of having to decode and encode the property file.
 			</para>
 			<para>
 				For more information refer to: <xref linkend="sect-Reference_Guide-XML_Resources_Bundles" />
@@ -65,26 +62,26 @@
 	<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 &#34;Change Language&#34; 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 role="XML">&#60;component&#62;
+  &#60;key&#62;org.exoplatform.services.resources.LocaleConfigService&#60;/key&#62;
+  &#60;type&#62;org.exoplatform.services.resources.impl.LocaleConfigServiceImpl&#60;/type&#62;
+  &#60;init-params&#62;
+    &#60;value-param&#62;
+      &#60;name&#62;locale.config.file&#60;/name&#62;
+      &#60;value&#62;war:/conf/common/locales-config.xml&#60;/value&#62;
+    &#60;/value-param&#62;
+  &#60;/init-params&#62;
+&#60;/component&#62;
 </programlisting>
 		<para>
-			This configuration points to the locale configuration file. 
-		</para>	
+			This configuration points to the locale configuration file.
+		</para>
 		<para>
 			The locale configuration file (<filename>02portal.war:/WEB-INF/conf/common/locales-config.xml</filename>) contains the following code:
 		</para>
@@ -97,35 +94,35 @@
 				<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>&#60;?xml version=&#34;1.0&#34; encoding=&#34;UTF-8&#34;?&#62;
+&#60;locales-config&#62;
+  &#60;locale-config&#62;
+    &#60;locale&#62;en&#60;/locale&#62;
+    &#60;output-encoding&#62;UTF-8&#60;/output-encoding&#62;
+    &#60;input-encoding&#62;UTF-8&#60;/input-encoding&#62;
+    &#60;description&#62;Default configuration for english locale&#60;/description&#62;
+  &#60;/locale-config&#62;
 
-  &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;
+  &#60;locale-config&#62;
+    &#60;locale&#62;fr&#60;/locale&#62;
+    &#60;output-encoding&#62;UTF-8&#60;/output-encoding&#62;
+    &#60;input-encoding&#62;UTF-8&#60;/input-encoding&#62;
+    &#60;description&#62;Default configuration for the french locale&#60;/description&#62;
+  &#60;/locale-config&#62;
 
-  &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;
+  &#60;locale-config&#62;
+    &#60;locale&#62;ar&#60;/locale&#62;
+    &#60;output-encoding&#62;UTF-8&#60;/output-encoding&#62;
+    &#60;input-encoding&#62;UTF-8&#60;/input-encoding&#62;
+    &#60;description&#62;Default configuration for the arabic locale&#60;/description&#62;
+    &#60;orientation&#62;rt&#60;/orientation&#62;
+  &#60;/locale-config&#62;
+&#60;/locales-config&#62;
 </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 &#34;<emphasis>ar</emphasis>&#34; is Arabic.
 					</para>
 				</callout>
 				<callout arearefs="area-Reference_Guide-i18n.locales.configuration.output-encoding">
@@ -165,39 +162,39 @@
 				<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>&#60;component&#62;
+  &#60;key&#62;org.exoplatform.services.resources.ResourceBundleService&#60;/key&#62;
+  &#60;type&#62;org.exoplatform.services.resources.impl.SimpleResourceBundleService&#60;/type&#62;
+  &#60;init-params&#62;
+    &#60;values-param&#62;
+      &#60;name&#62;classpath.resources&#60;/name&#62;
+      &#60;description&#62;The resources  that start with the following package name should be load from file system&#60;/description&#62;
+      &#60;value&#62;locale.portlet&#60;/value&#62;      
+    &#60;/values-param&#62;      
+    &#60;values-param&#62;
+      &#60;name&#62;init.resources&#60;/name&#62;
+      &#60;description&#62;Initiate the following resources during the first launch&#60;/description&#62;
+      &#60;value&#62;locale.portal.expression&#60;/value&#62;
+      &#60;value&#62;locale.portal.services&#60;/value&#62;
+      &#60;value&#62;locale.portal.webui&#60;/value&#62;
+      &#60;value&#62;locale.portal.custom&#60;/value&#62;
+      &#60;value&#62;locale.navigation.portal.classic&#60;/value&#62;
+      &#60;value&#62;locale.navigation.group.platform.administrators&#60;/value&#62;
+      &#60;value&#62;locale.navigation.group.platform.users&#60;/value&#62;
+      &#60;value&#62;locale.navigation.group.platform.guests&#60;/value&#62;
+      &#60;value&#62;locale.navigation.group.organization.management.executive-board&#60;/value&#62;               
+    &#60;/values-param&#62;      
+    &#60;values-param&#62;
+      &#60;name&#62;portal.resource.names&#60;/name&#62;
+      &#60;description&#62;The properties files of  the portal ,  those file will be merged 
+        into one ResoruceBundle properties &#60;/description&#62;
+      &#60;value&#62;locale.portal.expression&#60;/value&#62;
+      &#60;value&#62;locale.portal.services&#60;/value&#62;
+      &#60;value&#62;locale.portal.webui&#60;/value&#62;
+      &#60;value&#62;locale.portal.custom&#60;/value&#62;        
+    &#60;/values-param&#62;      
+  &#60;/init-params&#62;
+&#60;/component&#62;
 </programlisting>
 			<calloutlist>
 				<callout arearefs="area-Reference_Guide-i18n.rb.service.classpath_resources">
@@ -226,7 +223,7 @@
 	<section id="sect-Reference_Guide-Internationalization_Configuration-Navigation_Resource_Bundles">
 		<title>Navigation Resource Bundles</title>
 		<para>
-			There is a resource bundle for each navigation. A navigation can exist for user, groups, and portal. 
+			There is a resource bundle for each navigation. A navigation can exist for user, groups, and portal.
 		</para>
 		<para>
 			The previous example shows bundle definitions for the navigation of the classic portal and of four different groups. Each of these resource bundles occupies a different sphere, they are independent of each other and they are not included in the <parameter>portal.resource.names</parameter> parameter.
@@ -235,14 +232,13 @@
 			The properties for a group must be in the <filename>WEB-INF/classes/locale/navigation/group/</filename> folder. <literal>/WEB-INF/classes/locale/navigation/group/organization/management/executive-board_en.properties</literal>, for example.
 		</para>
 		<para>
-			The folder and file names must correspond to the group hierarchy. The group name "<parameter>executive-board</parameter>" is followed by the iso 639 code. 
+			The folder and file names must correspond to the group hierarchy. The group name &#34;<parameter>executive-board</parameter>&#34; is followed by the iso 639 code.
 		</para>
 		<para>
 			For each language defined in <parameter>LocalesConfig</parameter> must have a resource file defined. If the name of a group is changed the name of the folder and/or files of the correspondent navigation resource bundles must also be changed.
 		</para>
 		<para>
 			Content of <filename>executive-board_en.properties</filename>: 
-
 <programlisting>organization.title=Organization
 organization.newstaff=New Staff
 organization.management=Management
@@ -252,95 +248,95 @@
 			This resource bundle is only accessible for the navigation of the <parameter>organization.management.executive-board</parameter> group.
 		</para>
 	</section>
-
-	<section id="sect-Reference_Guide-Internationalization_Configuration-Portlets">
+	
+	<section id="sect-Reference_Guide-Internationalization_Configuration-_Portlets_">
 		<title> Portlets </title>
 		<para>
 			Portlets are independent applications and deliver their own resource files.
 		</para>
 		<para>
-			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.  -->
+			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>
+		<procedure id="proc-Reference_Guide-_Portlets_-Example">
 			<title>Example</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>
-				<step>
-					<para>
-						In <filename>portlet.xml</filename>, add <parameter>Spanish</parameter> as a <emphasis role="bold">supported-locale</emphasis> ('es' is the 2 letters 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;
+			<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>
+			<step>
+				<para>
+					In <filename>portlet.xml</filename>, add <parameter>Spanish</parameter> as a <emphasis role="bold">supported-locale</emphasis> (&#39;es&#39; is the 2 letters code for Spanish), the <emphasis role="bold">resource-bundle</emphasis> is already declared and is the same for all languages :
+				</para>
+				
+<programlisting role="XML">&#60;supported-locale&#62;en&#60;/supported-locale&#62;
+&#60;supported-locale&#62;es&#60;/supported-locale&#62;
+&#60;resource-bundle&#62;locale.portlet.gadget.GadgetPortlet&#60;/resource-bundle&#62;
 </programlisting>
-				</step>
+			</step>
 		</procedure>
+		
+		<para>
+			See the portlet specification for more details about portlet internationalization.
+		</para>
+		<section id="sect-Reference_Guide-_Portlets_-Standard_portlet_resource_keys">
+			<title>Standard portlet resource keys</title>
 			<para>
-				See the portlet specification for more details about portlet internationalization.
+				The portlet specifications defines three standard keys: Title, Short Title and Keywords. Keywords is formatted as a comma-separated list of tags.
 			</para>
-
-			<section id="sect-Reference_Guide-Example-Standard_portlet_resource_keys">
-				<title>Standard portlet resource keys</title>
-				<para>
-					The portlet specifications defines three standard keys: Title, Short Title and Keywords. Keywords is formatted as a comma-separated list of tags.
-				</para>
-				
+			
 <programlisting> javax.portlet.title=Breadcrumbs Portlet
  javax.portlet.short-title=Breadcrumbs
  javax.portlet.keywords=Breadcrumbs, Breadcrumb
 </programlisting>
-			</section>
-			
-			<section id="sect-Reference_Guide-Example-Access">
-				<title>Access</title>
-				<para>
-					These <emphasis>key</emphasis>s are used to display a property in the user language. 
-				</para>	
-				<para>
-					The following access method enables translation to the preferred language for the connected user:
-				</para>
-				<itemizedlist>
-					<listitem>
-						<para>
-							Groovy Template 
+		</section>
+		
+		<section id="sect-Reference_Guide-_Portlets_-Access">
+			<title>Access</title>
+			<para>
+				These <emphasis>key</emphasis>s are used to display a property in the user language.
+			</para>
+			<para>
+				The following access method enables translation to the preferred language for the connected user:
+			</para>
+			<itemizedlist>
+				<listitem>
+					<para>
+						Groovy Template 
 <programlisting>TODO
 </programlisting>
-						</para>
-					</listitem>
-					<listitem>
-						<para>
-							Java 
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						Java 
 <programlisting>WebuiRequestContext context = WebuiRequestContext.getCurrentInstance() ;
 ResourceBundle res = context.getApplicationResourceBundle() ;
 String translatedString = res.getString(key);
 </programlisting>
-						</para>
-					</listitem>
-				</itemizedlist>
-
+					</para>
+				</listitem>
+			</itemizedlist>
 		</section>
 		
-		<section id="sect-Reference_Guide-Portlets-Debugging_resource_bundle_usage">
+		<section id="sect-Reference_Guide-_Portlets_-Debugging_resource_bundle_usage">
 			<title>Debugging resource bundle usage</title>
 			<para>
-				When translating an application it can sometimes be difficult to find the right key for a given property. 
-			</para>				
+				When translating an application it can sometimes be difficult to find the right key for a given property.
+			</para>
 			<para>
 				Execute the portal in <emphasis role="bold">debug mode</emphasis> and select, from the available languages, select the special language; <emphasis role="bold">Magic locale</emphasis>.
 			</para>
 			<para>
-				This feature translates a key to the same key value. 
-			</para>	
+				This feature translates a key to the same key value.
+			</para>
 			<para>
-				For example, the translated value for the key "<parameter>organization.title</parameter>" is simply the value "<parameter>organization.title</parameter>". Selecting that language allows use of the portal and its applications with all the keys visible. This makes it easier to find out the correct key for a given label in the portal page.
+				For example, the translated value for the key &#34;<parameter>organization.title</parameter>&#34; is simply the value &#34;<parameter>organization.title</parameter>&#34;. Selecting that language allows use of the portal and its applications with all the keys visible. This makes it easier to find out the correct key for a given label in the portal page.
 			</para>
 		</section>
 

Modified: portal/trunk/docs/reference-guide/en/modules/development/JavaScript_Inter_Application_Communication.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/development/JavaScript_Inter_Application_Communication.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/development/JavaScript_Inter_Application_Communication.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,14 +1,12 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-JavaScript_Inter_Application_Communication">
 	<title>JavaScript Inter Application Communication</title>
 	<section id="sect-Reference_Guide-JavaScript_Inter_Application_Communication-Overview">
 		<title>Overview</title>
 		<para>
-			JavaScript Inter Application Communication is designed to allow applications within a page to exchange data. This library is made for broadcasting messages on topic. 
+			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:
@@ -31,31 +29,30 @@
 			</listitem>
 		</itemizedlist>
 		<para>
-			A subscription to a topic will receive any subtopic messages. For example; An application subscribed to "<literal>/eXo/application</literal>" will receive messages sent on the "<literal>/eXo/application/map</literal>" topic. A message sent on "<literal>/eXo</literal>", however, would not be received.
+			A subscription to a topic will receive any subtopic messages. For example; An application subscribed to &#34;<literal>/eXo/application</literal>&#34; will receive messages sent on the &#34;<literal>/eXo/application/map</literal>&#34; topic. A message sent on &#34;<literal>/eXo</literal>&#34;, however, would not be received.
 		</para>
-		<variablelist>
+		<variablelist id="vari-Reference_Guide-Overview-Subscription_Topics">
 			<title>Subscription Topics</title>
-		  <varlistentry>
-			<term>/eXo</term>
-			<listitem>
-				<para>
-					This topic contains all the events generated by the platform.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<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.
-				</para>
-			</listitem>
-		</varlistentry>
+			<varlistentry>
+				<term>/eXo</term>
+				<listitem>
+					<para>
+						This topic contains all the events generated by the platform.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<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.
+					</para>
+				</listitem>
+			</varlistentry>
 		</variablelist>
-
 	</section>
 	
-	<!--  
+	<!--   
    <section
       id="sect-Reference_Guide-JavaScript_Inter_Application_Communication-GateInportalchangeTitle">
       <title>/GateIn/portal/changeTitle (not
@@ -101,7 +98,7 @@
          Receive a message when an application is unloaded in the page.
 		</para>
    </section>
-  -->
+   -->
 	<section id="sect-Reference_Guide-JavaScript_Inter_Application_Communication-Library">
 		<title>Library</title>
 		<para>
@@ -112,7 +109,7 @@
  * publish is used to publish an event to the other subscribers to the given channels
  * @param {Object} senderId is a string that identify the sender
  * @param {String} topic is the topic that the message will be published
- * @param {Object} message is the message that's going to be delivered to the subscribers to the topic
+ * @param {Object} message is the message that&#39;s going to be delivered to the subscribers to the topic
  */
 Topic.prototype.publish = function(/*Object*/ senderId, /*String*/ topicName, /*Object*/ message ) { ... }
 
@@ -150,12 +147,11 @@
 		<para>
 			The three messaging functions require particular objects and definitions in their syntax:
 		</para>
-
 		<variablelist>
 			<varlistentry>
-			<term>Subscribe</term>
+				<term>Subscribe</term>
 				<listitem>
-					<para>	
+					<para>
 						The <literal>subscribe</literal> function is used to subscribe a callback to a topic. It uses the following parameters:
 					</para>
 					<variablelist>
@@ -188,7 +184,7 @@
 				<term>Publish</term>
 				<listitem>
 					<para>
-						The <literal>publish</literal> function is used to publish an event to the other subscribered applications through the given channels. Its parameters are: 
+						The <literal>publish</literal> function is used to publish an event to the other subscribered applications through the given channels. Its parameters are:
 					</para>
 					<variablelist>
 						<varlistentry>
@@ -201,19 +197,19 @@
 						</varlistentry>
 						<varlistentry>
 							<term>topicName</term>
-								<listitem>
-									<para>
-										The topic that the message will be published.
-									</para>
-								</listitem>
+							<listitem>
+								<para>
+									The topic that the message will be published.
+								</para>
+							</listitem>
 						</varlistentry>
 						<varlistentry>
 							<term>message</term>
-								<listitem>
-									<para>
-										This is the message body to be delivered to the subscribers to the topic.
-									</para>
-								</listitem>
+							<listitem>
+								<para>
+									This is the message body to be delivered to the subscribers to the topic.
+								</para>
+							</listitem>
 						</varlistentry>
 					</variablelist>
 				</listitem>
@@ -222,7 +218,7 @@
 				<term>Unsubscribe</term>
 				<listitem>
 					<para>
-						The <literal>unsubscribe</literal> function is used to unsubscribe a callback to a topic. The required parameters are: 
+						The <literal>unsubscribe</literal> function is used to unsubscribe a callback to a topic. The required parameters are:
 					</para>
 					<variablelist>
 						<varlistentry>
@@ -247,26 +243,26 @@
 		</variablelist>
 	</section>
 	
-	<section id="sect-Reference_Guide-JavaScript_Inter_Application_Communication-Example">
+	<section id="sect-Reference_Guide-JavaScript_Inter_Application_Communication-Example_of_what">
 		<title>Example [of what?]</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 role="HTML">&#60;%@ taglib uri=&#34;http://java.sun.com/portlet&#34; prefix=&#34;portlet&#34; %&#62;
+&#60;portlet:defineObjects/&#62;
+&#60;div&#62;
+  &#60;p&#62;
     Received messages:
-    &lt;div id="received_&lt;portlet:namespace/&gt;"&gt;
+    &#60;div id=&#34;received_&#60;portlet:namespace/&#62;&#34;&#62;
          
-    &lt;/div&gt;
-  &lt;/p&gt;
+    &#60;/div&#62;
+  &#60;/p&#62;
    
-  &lt;p&gt;
+  &#60;p&#62;
     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;
+    &#60;input type=&#34;text&#34; id=&#34;msg_&#60;portlet:namespace/&#62;&#34;/&#62; &#60;a href=&#34;#&#34; onclick=&#34;send_&#60;portlet:namespace/&#62;();&#34;&#62;send&#60;/a&#62;
+  &#60;/p&#62;
+&#60;/div&#62;
 
-&lt;script type="text/javascript"&gt;
+&#60;script type=&#34;text/javascript&#34;&#62;
    
   Function.prototype.bind = function(object) {
     var method = this;
@@ -275,28 +271,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_&#60;portlet:namespace/&#62;() {
+    var msg = document.getElementById(&#34;msg_&#60;portlet:namespace/&#62;&#34;).value;
+    eXo.core.Topic.publish(&#34;&#60;portlet:namespace/&#62;&#34;, &#34;/demo&#34;, msg);
   }
    
-  function Listener_&lt;portlet:namespace/&gt;(){
+  function Listener_&#60;portlet:namespace/&#62;(){
       
   }
    
-  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;* " + 
-      event.senderId + ": " + event.message;
+  Listener_&#60;portlet:namespace/&#62;.prototype.receiveMsg = function(event) {
+    document.getElementById(&#34;received_&#60;portlet:namespace/&#62;&#34;).innerHTML = 
+      document.getElementById(&#34;received_&#60;portlet:namespace/&#62;&#34;).innerHTML + &#34;&#60;br /&#62;* &#34; + 
+      event.senderId + &#34;: &#34; + 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_&#60;portlet:namespace/&#62;() {
+    var listener_&#60;portlet:namespace/&#62; = new Listener_&#60;portlet:namespace/&#62;();
+    eXo.core.Topic.subscribe(&#34;/demo&#34;, listener_&#60;portlet:namespace/&#62;.receiveMsg.bind(listener_&#60;portlet:namespace/&#62;));
   }
    
-  init_&lt;portlet:namespace/&gt;();
-&lt;/script&gt;
+  init_&#60;portlet:namespace/&#62;();
+&#60;/script&#62;
 </programlisting>
 	</section>
 

Modified: portal/trunk/docs/reference-guide/en/modules/development/Portal_Lifecycle.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/development/Portal_Lifecycle.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/development/Portal_Lifecycle.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Portal_Lifecycle">
 	<title>Portal Lifecycle</title>
@@ -18,16 +16,16 @@
 			A portal instance is simply a web application deployed as a WAR in an application server. Portlets are also part of an enhanced WAR called a portlet application.
 		</para>
 		<para>
-			&PRODUCT; doesn't require any particular setup for your portlet in most common scenarios and the <filename>web.xml</filename> file can remain without any &PRODUCT; specific configuration. 
+			&PRODUCT; doesn&#39;t require any particular setup for your portlet in most common scenarios and the <filename>web.xml</filename> file can remain without any &PRODUCT; specific configuration.
 		</para>
 		<para>
 			During deployment, &PRODUCT; will automatically and transparently inject a servlet into the portlet application to be able to interact with it. This feature is dependent on the underlying servlet container but will work out of the box on the proposed bundles.
 		</para>
 	</section>
 	
-	<!--  
+	<!--   
 	   TODO: Define the added listener
-	  --><!--  
+	   --><!--   
 	<section id="sect-Reference_Guide-Portal_Lifecycle-The_Listener">
 		<title>The Listener</title>
 		<para>
@@ -87,7 +85,7 @@
     }
   }
 </programlisting>
-  -->
+   -->
 	<section id="sect-Reference_Guide-Portal_Lifecycle-The_Command_Servlet">
 		<title>The Command Servlet</title>
 		<para>
@@ -101,21 +99,22 @@
 				As the servlet is already configured this example is for information only.
 			</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;
+&#60;servlet&#62;
+  &#60;servlet-name&#62;TomcatGateInServlet&#60;/servlet-name&#62;
+  &#60;servlet-class&#62;org.gatein.wci.command.CommandServlet&#60;/servlet-class&#62;
+  &#60;load-on-startup&#62;0&#60;/load-on-startup&#62;
+&#60;/servlet&#62;
   
-&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;
+&#60;servlet-mapping&#62;
+  &#60;servlet-name&#62;TomcatGateInServlet&#60;/servlet-name&#62;
+  &#60;url-pattern&#62;/tomcatgateinservlet&#60;/url-pattern&#62;
+&#60;/servlet-mapping&#62;
 </programlisting>
 		<para>
 			It is possible to filter on the CommandServlet by filtering the URL pattern used by the Servlet mapping.
-		</para>	
+		</para>
 		<para>
 			The example below would create a servlet filter that calculates the time of execution of a portlet request.
 		</para>
@@ -142,7 +141,7 @@
     long beforeTime = System.currentTimeMillis();
     chain.doFilter(request, response);
     long afterTime = System.currentTimeMillis();
-    System.out.println("Time to execute the portlet request (in ms): " + (afterTime - beforeTime));
+    System.out.println(&#34;Time to execute the portlet request (in ms): &#34; + (afterTime - beforeTime));
   }
 
   public void init(FilterConfig config) throws ServletException
@@ -160,23 +159,23 @@
 		</para>
 		
 <programlisting role="XML">
-&lt;?xml version="1.0"?&gt;
-&lt;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;
+&#60;?xml version=&#34;1.0&#34;?&#62;
+&#60;web-app xmlns:xsi=&#34;http://www.w3.org/2001/XMLSchema-instance&#34;
+    xsi:schemaLocation=&#34;http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd&#34;
+    version=&#34;2.5&#34;&#62;
         
-  &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;
+  &#60;filter&#62;
+    &#60;filter-name&#62;MyFilter&#60;/filter-name&#62;
+    &#60;filter-class&#62;org.example.MyFilter&#60;/filter-class&#62;        
+  &#60;/filter&#62;
 
-  &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;    
+  &#60;filter-mapping&#62;
+    &#60;filter-name&#62;MyFilter&#60;/filter-name&#62;
+    &#60;url-pattern&#62;/tomcatgateinservlet&#60;/url-pattern&#62;
+    &#60;dispatcher&#62;INCLUDE&#60;/dispatcher&#62;  
+  &#60;/filter-mapping&#62;    
     
-&lt;/web-app&gt;
+&#60;/web-app&#62;
 </programlisting>
 		<para>
 			<note>
@@ -188,7 +187,7 @@
 		</para>
 	</section>
 	
-	<!--  
+	<!--   
 		<para>
 			Here is its definition in the web.xml file:
 		</para>
@@ -1033,7 +1032,7 @@
   }
 </programlisting>
 	</section>
- -->
+  -->
 </section>
 
 

Modified: portal/trunk/docs/reference-guide/en/modules/development/Right_To_Left_Framework.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/development/Right_To_Left_Framework.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/development/Right_To_Left_Framework.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,14 +1,12 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-RTL_Right_To_Left_Framework">
 	<title>RTL (Right To Left) Framework</title>
-		<para>
-			The text orientation depends on the current locale setting. The orientation is a Java 5 enum that provides a set of functionalities:
-		</para>
-		
+	<para>
+		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
    RT, // Middle East (Arabic, Hebrew)
@@ -19,16 +17,15 @@
    public boolean isTL() { ... }
    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>.
-		</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>.
-		</para>
-		<para>
-			In the case of a different context such as the <literal>PortletRequestContext</literal>, it delegates to the parent context given the fact that the root <literal>RequestContext</literal> is always a <literal>PortalRequestContext</literal>.
-		</para>
-	
+	<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>.
+	</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>.
+	</para>
+	<para>
+		In the case of a different context such as the <literal>PortletRequestContext</literal>, it delegates to the parent context given the fact that the root <literal>RequestContext</literal> is always a <literal>PortalRequestContext</literal>.
+	</para>
 	<section id="sect-Reference_Guide-RTL_Right_To_Left_Framework-Groovy_templates">
 		<title>Groovy templates</title>
 		<para>
@@ -63,7 +60,7 @@
 				<term>dir</term>
 				<listitem>
 					<para>
-						The string 'ltr' if the orientation is LT or the string 'rtl' if the orientation is RT.
+						The string &#39;ltr&#39; if the orientation is LT or the string &#39;rtl&#39; if the orientation is RT.
 					</para>
 				</listitem>
 			</varlistentry>
@@ -74,14 +71,14 @@
 		<title>Stylesheet</title>
 		<para>
 			The skin service handles stylesheet rewriting to accommodate the orientation. It works by appending -lt or -rt to the stylesheet name.
-		</para>	
+		</para>
 		<para>
 			For instance: <filename>/web/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet-rt.css</filename> will return the same stylesheet as <filename>/web/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</filename> but processed for the RT orientation. The <parameter>-lt</parameter> suffix is optional.
 		</para>
 		<para>
 			Stylesheet authors can annotate their stylesheet to create content that depends on the orientation.
 		</para>
-		<formalpara>
+		<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: 
@@ -108,8 +105,7 @@
 </programlisting>
 			</para>
 		</formalpara>
-		
-		<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: 
@@ -117,7 +113,7 @@
 color: white;
 line-height: 24px;
 padding: 0px 5px 0px 0px; /* orientation=lt */
-padding: 0px 0px 0px 5px; /* &gt;orientation=rt */
+padding: 0px 0px 0px 5px; /* &#62;orientation=rt */
 </programlisting>
 				 The LT produced output will be: 
 <programlisting> 
@@ -133,7 +129,6 @@
 </programlisting>
 			</para>
 		</formalpara>
-
 	</section>
 	
 	<section id="sect-Reference_Guide-RTL_Right_To_Left_Framework-Images">
@@ -142,14 +137,14 @@
 			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.
 		</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. 
-		</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.
+		</para>
 		<para>
-		For instance: requesting the image <filename>/GateInResources/skin/DefaultSkin/webui/component/UITabSystem/UITabs/background/NormalTabStyle-rt.gif</filename> returns a mirror of the image <filename>/GateInResources/skin/DefaultSkin/webui/component/UITabSystem/UITabs/background/NormalTabStyle.gif</filename>. 
+			For instance: requesting the image <filename>/GateInResources/skin/DefaultSkin/webui/component/UITabSystem/UITabs/background/NormalTabStyle-rt.gif</filename> returns a mirror of the image <filename>/GateInResources/skin/DefaultSkin/webui/component/UITabSystem/UITabs/background/NormalTabStyle.gif</filename>.
 		</para>
 		<note>
 			<para>
-				It is important to consider whether the image to be mirrored is symmetrical as this will impact it's final appearance.
+				It is important to consider whether the image to be mirrored is symmetrical as this will impact it&#39;s final appearance.
 			</para>
 		</note>
 		<para>
@@ -158,8 +153,8 @@
 		
 <programlisting>
 line-height: 24px; 
-background: url('background/NavigationTab.gif') no-repeat right top; /* orientation=lt */
-background: url('background/NavigationTab-rt.gif') no-repeat left top; /* orientation=rt */
+background: url(&#39;background/NavigationTab.gif&#39;) no-repeat right top; /* orientation=lt */
+background: url(&#39;background/NavigationTab-rt.gif&#39;) no-repeat left top; /* orientation=rt */
 padding-right: 2px; /* orientation=lt */
 padding-left: 2px; /* orientation=rt */
 </programlisting>
@@ -168,43 +163,42 @@
 	<section id="sect-Reference_Guide-RTL_Right_To_Left_Framework-Client_side_JavaScript">
 		<title>Client side JavaScript</title>
 		<para>
-			The <literal>eXo.core.I18n</literal> object provides the following parameters for orientation: 
+			The <literal>eXo.core.I18n</literal> object provides the following parameters for orientation:
 		</para>
-			<variablelist>
-				<varlistentry>
-					<term>getOrientation()</term>
-					<listitem>
-						<para>
-							Returns either the string lt or rt
-						</para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term>getDir()</term>
-					<listitem>
-						<para>
-							Returns either the string ltr or rtl
-						</para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term>isLT()</term>
-					<listitem>
-						<para>
-							Returns true for LT
-						</para>
-					</listitem>
-				</varlistentry>
-				<varlistentry>
-					<term>isRT()</term>
-					<listitem>
-						<para>
-							Returns true of RT
-						</para>
-					</listitem>
-				</varlistentry>
-			</variablelist>
-
+		<variablelist>
+			<varlistentry>
+				<term>getOrientation()</term>
+				<listitem>
+					<para>
+						Returns either the string lt or rt
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>getDir()</term>
+				<listitem>
+					<para>
+						Returns either the string ltr or rtl
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>isLT()</term>
+				<listitem>
+					<para>
+						Returns true for LT
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>isRT()</term>
+				<listitem>
+					<para>
+						Returns true of RT
+					</para>
+				</listitem>
+			</varlistentry>
+		</variablelist>
 	</section>
 
 </section>

Modified: portal/trunk/docs/reference-guide/en/modules/development/Upload_Component.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/development/Upload_Component.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/development/Upload_Component.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,11 +1,9 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Upload_Component">
 	<title>Upload Component</title>
-<!--	<section id="sect-Reference_Guide-Upload_Component-Overview">
+	<!-- 	<section id="sect-Reference_Guide-Upload_Component-Overview">
 		<title>Overview</title>
 		<para>
 			In this article, you will learn how to :
@@ -32,8 +30,7 @@
 				</para>
 			</listitem>
 		</itemizedlist>
-	</section> -->
-	
+	</section>  -->
 	<section id="sect-Reference_Guide-Upload_Component-Upload_Service">
 		<title>Upload Service</title>
 		<para>
@@ -43,76 +40,75 @@
 			This can be configured with the following xml code:
 		</para>
 		
-<programlisting role="XML">&lt;component&gt;
-   &lt;type&gt;org.exoplatform.upload.UploadService&lt;/type&gt;
-     &lt;init-params&gt;
-       &lt;value-param&gt;
-        &lt;name&gt;upload.limit.size&lt;/name&gt;
-        &lt;description&gt;Maximum size of the file to upload in MB&lt;/description&gt;
-        &lt;value&gt;10&lt;/value&gt;
-      &lt;/value-param&gt;
-    &lt;/init-params&gt;  
-  &lt;/component&gt;
+<programlisting role="XML">&#60;component&#62;
+   &#60;type&#62;org.exoplatform.upload.UploadService&#60;/type&#62;
+     &#60;init-params&#62;
+       &#60;value-param&#62;
+        &#60;name&#62;upload.limit.size&#60;/name&#62;
+        &#60;description&#62;Maximum size of the file to upload in MB&#60;/description&#62;
+        &#60;value&#62;10&#60;/value&#62;
+      &#60;/value-param&#62;
+    &#60;/init-params&#62;  
+  &#60;/component&#62;
 </programlisting>
 		<para>
 			This code allows for a default upload size limit for the service to be configured. The value unit is in MegaBytes.
-		</para>	
+		</para>
 		<para>
 			This limit will be used by default by all applications if no application-specific limit is set. Setting a different limit for applications is discussed in a later section.
 		</para>
 		<para>
 			If the value is set at <parameter>0</parameter> the upload size is unlimited.
 		</para>
-
-		<procedure id="proc-Reference_Guide-Upload_Component-How_to_use_the_upload_component">
+		<procedure id="proc-Reference_Guide-Upload_Service-How_to_use_the_upload_component">
 			<title>How to use the upload component</title>
 			<step>
 				<para>
-				Create an object type <literal>org.exoplatform.webui.form.UIFormUploadInput</literal>.
+					Create an object type <literal>org.exoplatform.webui.form.UIFormUploadInput</literal>.
 				</para>
 				<para>
 					Two constructors are available for this:
 				</para>
-						
+				
 <programlisting>public UIFormUploadInput(String name, String bindingExpression)
 </programlisting>
 				<para>
 					or:
 				</para>
-						
+				
 <programlisting>public UIFormUploadInput(String name, String bindingExpression, int limit)
 </programlisting>
 				<para>
 					This is an example using the second form :
 				</para>
-						
+				
 <programlisting role="JAVA">PortletRequestContext pcontext = (PortletRequestContext)WebuiRequestContext.getCurrentInstance();
 PortletPreferences portletPref = pcontext.getRequest().getPreferences();
-int limitMB = Integer.parseInt(portletPref.getValue("uploadFileSizeLimitMB", "").trim());
-UIFormUploadInput uiInput = new UIFormUploadInput("upload", "upload", limitMB);
+int limitMB = Integer.parseInt(portletPref.getValue(&#34;uploadFileSizeLimitMB&#34;, &#34;&#34;).trim());
+UIFormUploadInput uiInput = new UIFormUploadInput(&#34;upload&#34;, &#34;upload&#34;, limitMB);
 </programlisting>
 			</step>
 			<step>
 				<para>
 					To obtain the limit from the <literal>xml</literal> configuration, this piece of code can be added to the either <filename>portlet.xml</filename> or <filename>portlet-preferences.xml</filename> :
 				</para>
-
-<programlisting role="XML">&lt;preference&gt;
-  &lt;name&gt;uploadFileSizeLimitMB&lt;/name&gt;
-  &lt;value&gt;30&lt;/value&gt;
-  &lt;read-only&gt;false&lt;/read-only&gt;
-&lt;/preference&gt;
+				
+<programlisting role="XML">&#60;preference&#62;
+  &#60;name&#62;uploadFileSizeLimitMB&#60;/name&#62;
+  &#60;value&#62;30&#60;/value&#62;
+  &#60;read-only&#62;false&#60;/read-only&#62;
+&#60;/preference&#62;
 </programlisting>
-		<para>
-			Again, a <parameter>0</parameter> value means an unlimited upload size, and the value unit is set in MegaBytes.
-		</para>
+				<para>
+					Again, a <parameter>0</parameter> value means an unlimited upload size, and the value unit is set in MegaBytes.
+				</para>
 			</step>
 			<step>
 				<para>
 					Use the <literal>getUploadDataAsStream()</literal> method to get the uploaded data:
 				</para>
-		
-<programlisting role="JAVA">UIFormUploadInput input = (UIFormUploadInput)uiForm.getUIInput("upload");
+				
+<programlisting role="JAVA">UIFormUploadInput input = (UIFormUploadInput)uiForm.getUIInput(&#34;upload&#34;);
 InputStream inputStream = input.getUploadDataAsStream();
 ...
 jcrData.setValue(inputStream);
@@ -137,19 +133,20 @@
 				<para>
 					Use the<literal>removeUpload()</literal> method defined in the upload service to purge the file:
 				</para>
-		
+				
 <programlisting role="JAVA">UploadService uploadService = uiForm.getApplicationComponent(UploadService.class) ;
 UIFormUploadInput uiChild = uiForm.getChild(UIFormUploadInput.class) ;
 uploadService.removeUpload(uiChild.getUploadId()) ;
 </programlisting>
-<note>
-	<title>Saving the uploaded file</title>
-	<para>
-		Ensure the file is saved <emphasis role="bold">before</emphasis> the service is cleaned.
-	</para>
-</note>
+				<note>
+					<title>Saving the uploaded file</title>
+					<para>
+						Ensure the file is saved <emphasis role="bold">before</emphasis> the service is cleaned.
+					</para>
+				</note>
 			</step>
 		</procedure>
+
 	</section>
 
 </section>

Modified: portal/trunk/docs/reference-guide/en/modules/development/XML_Resource_Bundles.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/development/XML_Resource_Bundles.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/development/XML_Resource_Bundles.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,7 +1,5 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-XML_Resources_Bundles">
 	<title>XML Resources Bundles</title>
@@ -32,7 +30,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> (Don&#39;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:
 		</para>
 		
 <programlisting>UIAccountForm.tab.label.AccountInputSet = ...
@@ -46,28 +44,28 @@
 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 role="XML">&#60;?xml version=&#34;1.0&#34; encoding=&#34;UTF-8&#34;?&#62;
+&#60;bundle&#62;
+  &#60;UIAccountForm&#62;
+    &#60;tab&#62;
+      &#60;label&#62;
+        &#60;AccountInputSet&#62;...&#60;/AccountInputSet&#62;
+        &#60;UIUserProfileInputSet&#62;...&#60;/UIUserProfileInputSet&#62;
+      &#60;/label&#62;
+    &#60;/tab&#62;
+    &#60;label&#62;
+      &#60;Profile&#62;...&#60;/Profile&#62;
+      &#60;HomeInfo&#62;...&#60;/HomeInfo&#62;
+      &#60;BusinessInfo&#62;...&#60;/BusinessInfo&#62;
+      &#60;password&#62;...&#60;/password&#62;
+      &#60;Confirmpassword&#62;...&#60;/Confirmpassword&#62;
+      &#60;email&#62;...&#60;/email&#62;
+    &#60;/label&#62;
+    &#60;action&#62;
+      &#60;Reset&#62;...&#60;/Reset&#62;
+    &#60;/action&#62;
+  &#60;/UIAccountForm&#62;
+&#60;/bundle&#62;
 </programlisting>
 	</section>
 	
@@ -75,9 +73,9 @@
 		<title>Portal support</title>
 		<para>
 			In order to be loaded by the portal at runtime (actually the resource bundle service), the name of the file must be the same as a property file and it must use the <emphasis role="bold">.xml</emphasis> suffix.
-		</para>	
+		</para>
 		<para>
-			For example; for the Account Portlet to be displayed in Arabic, the resource bundle would be  <emphasis role="bold"> AccountPortlet_ar.xml</emphasis> rather than <emphasis role="bold">AccountPortlet_ar.properties</emphasis>.
+			For example; for the Account Portlet to be displayed in Arabic, the resource bundle would be <emphasis role="bold"> AccountPortlet_ar.xml</emphasis> rather than <emphasis role="bold">AccountPortlet_ar.properties</emphasis>.
 		</para>
 	</section>
 

Modified: portal/trunk/docs/reference-guide/en/modules/gadgets/Gadgets.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/gadgets/Gadgets.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/gadgets/Gadgets.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,84 +1,82 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Gadgets">
 	<title>Gadgets</title>
-		<para>
-			A gadget is a mini web application, embedded in a web page and running on an application server platform. These small applications help users perform various tasks.
-		</para>
-		<para>
-			&PRODUCT; supports gadgets such as: Todo gadget, Calendar gadget, Calculator gadget, Weather Forecasts and and RSS Reader.
-		</para>
-		<variablelist id="vari-User_Guide-Using_the_Dashboard_Workspace-Default_Gadgets">
-			<title>Default Gadgets:</title>
-			<varlistentry>
-				<term>Calendar</term>
-				<listitem>
-					<para>
-						The calendar gadget allows users to switch easily between daily, monthly and yearly view and, again, is customizable to match your portal's theme.
-					</para>
-					<mediaobject>
+	<para>
+		A gadget is a mini web application, embedded in a web page and running on an application server platform. These small applications help users perform various tasks.
+	</para>
+	<para>
+		&PRODUCT; supports gadgets such as: Todo gadget, Calendar gadget, Calculator gadget, Weather Forecasts and and RSS Reader.
+	</para>
+	<variablelist id="vari-Reference_Guide-Gadgets-Default_Gadgets">
+		<title>Default Gadgets:</title>
+		<varlistentry>
+			<term>Calendar</term>
+			<listitem>
+				<para>
+					The calendar gadget allows users to switch easily between daily, monthly and yearly view and, again, is customizable to match your portal&#39;s theme.
+				</para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="images/Calendar.png" format="PNG" />
+					</imageobject>
+				</mediaobject>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term>ToDo</term>
+			<listitem>
+				<para>
+					This application helps you organize your day and work group. It is designed to keep track of your tasks in a convenient and transparent way. Tasks can be highlighted with different colors.
+				</para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="images/Todo.png" format="PNG" />
+					</imageobject>
+				</mediaobject>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term>Calculator</term>
+			<listitem>
+				<para>
+					This mini-application lets you perform most basic arithmetic operations and can be themed to match the rest of your portal.
+				</para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="images/Calculator.png" format="PNG" />
+					</imageobject>
+				</mediaobject>
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term>RSS Reader</term>
+			<listitem>
+				<para>
+					An RSS reader, or aggregator, collates content from various, user-specified feed sources and displays them in one location. This content can include, but isn&#39;t limited to, news headlines, blog posts or email. The RSS Reader gadget displays this content in a single window on your Portal page.
+				</para>
+				<!--   <mediaobject>
 						<imageobject>
-							<imagedata fileref="images/Calendar.png" format="PNG" />
-						</imageobject>
-					</mediaobject>
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term>ToDo</term>
-				<listitem>
-					<para>
-						This application helps you organize your day and work group. It is designed to keep track of your tasks in a convenient and transparent way. Tasks can be highlighted with different colors.
-					</para>
-					<mediaobject>
-						<imageobject>
-							<imagedata fileref="images/Todo.png" format="PNG" />
-						</imageobject>
-					</mediaobject>
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term>Calculator</term>
-				<listitem>
-					<para>
-						This mini-application lets you perform most basic arithmetic operations and can be themed to match the rest of your portal.
-					</para>
-					<mediaobject>
-						<imageobject>
-							<imagedata fileref="images/Calculator.png" format="PNG" />
-						</imageobject>
-					</mediaobject>
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term>RSS Reader</term>
-				<listitem>
-					<para>
-						An RSS reader, or aggregator, collates content from various, user-specified feed sources and displays them in one location. This content can include, but isn't limited to, news headlines, blog posts or email. The RSS Reader gadget displays this content in a single window on your Portal page.
-					</para>
-					<!--  <mediaobject>
-						<imageobject>
 							<imagedata fileref="images/RSS.png" format="PNG"></imagedata>
 						</imageobject>
-					</mediaobject>  -->
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term>More Gadgets</term>
-				<listitem>
-					<para>
-						Further gadgets can be obtained from the <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> site. &PRODUCT; is compatible with most of the gadgets available here.
-					</para>
-				</listitem>
-			</varlistentry>
-		</variablelist>
-<important>
-	<para>
-		The following sections require more textual information.
-	</para>
-</important>
+					</mediaobject>   -->
+			</listitem>
+		</varlistentry>
+		<varlistentry>
+			<term>More Gadgets</term>
+			<listitem>
+				<para>
+					Further gadgets can be obtained from the <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> site. &PRODUCT; is compatible with most of the gadgets available here.
+				</para>
+			</listitem>
+		</varlistentry>
+	</variablelist>
+	<important>
+		<para>
+			The following sections require more textual information.
+		</para>
+	</important>
 	<section id="sect-Reference_Guide-Gadgets-Existing_Gadgets">
 		<title>Existing Gadgets</title>
 		<mediaobject>

Modified: portal/trunk/docs/reference-guide/en/modules/gadgets/Setup_a_Gadget_Server.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/gadgets/Setup_a_Gadget_Server.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/gadgets/Setup_a_Gadget_Server.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,14 +1,12 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Setup_a_Gadget_Server">
 	<title>Setup a Gadget Server</title>
 	<section id="sect-Reference_Guide-Setup_a_Gadget_Server-Virtual_servers_for_gadget_rendering">
 		<title>Virtual servers for gadget rendering</title>
 		<para>
-			&PRODUCT; recommends using two virtual hosts for security. If the gadget is running on a different domain than the container (the website that 'contains' the app), it is unable to interfere with the portal by modifying code or cookies.
+			&PRODUCT; recommends using two virtual hosts for security. If the gadget is running on a different domain than the container (the website that &#39;contains&#39; the app), it is unable to interfere with the portal by modifying code or cookies.
 		</para>
 		<para>
 			An example would hosting the portal from <emphasis role="bold">http://www.sample.com</emphasis> and the gadgets from <emphasis role="bold">http://www.samplemodules.com</emphasis>.
@@ -16,19 +14,19 @@
 		<para>
 			To do this, configure a parameter called <emphasis>gadgets.hostName</emphasis>. The value is the <emphasis>path/to/gadgetServer</emphasis> in <literal>GadgetRegisteryService</literal>:
 		</para>
-<programlisting>&lt;component&gt;
-  &lt;key&gt;org.exoplatform.application.gadget.GadgetRegistryService&lt;/key&gt;
-  &lt;type&gt;org.exoplatform.application.gadget.jcr.GadgetRegistryServiceImpl&lt;/type&gt;
-  &lt;init-params&gt;
-    &lt;value-param&gt;
-      &lt;name&gt;gadgets.hostName&lt;/name&gt;
-      &lt;description&gt;Gadget server url&lt;/description&gt;
-      &lt;value&gt;http://localhost:8080/GateInGadgetServer/gadgets/&lt;/value&gt;
-    &lt;/value-param&gt;
-  &lt;/init-params&gt;
-&lt;/component&gt;
+		
+<programlisting>&#60;component&#62;
+  &#60;key&#62;org.exoplatform.application.gadget.GadgetRegistryService&#60;/key&#62;
+  &#60;type&#62;org.exoplatform.application.gadget.jcr.GadgetRegistryServiceImpl&#60;/type&#62;
+  &#60;init-params&#62;
+    &#60;value-param&#62;
+      &#60;name&#62;gadgets.hostName&#60;/name&#62;
+      &#60;description&#62;Gadget server url&#60;/description&#62;
+      &#60;value&#62;http://localhost:8080/GateInGadgetServer/gadgets/&#60;/value&#62;
+    &#60;/value-param&#62;
+  &#60;/init-params&#62;
+&#60;/component&#62;
 </programlisting>
-
 		<para>
 			It is also possible to have multiple rendering servers. This helps to balance the rendering load across multiple servers.
 		</para>
@@ -48,7 +46,7 @@
 				In Linux systems this file can be generated with:
 			</para>
 			
-<programlisting><command>dd if=/dev/random bs=32 count=1  | openssl base64 &gt; /tmp/key.txt</command>
+<programlisting><command>dd if=/dev/random bs=32 count=1 | openssl base64 &#62; /tmp/key.txt</command>
 </programlisting>
 		</section>
 		
@@ -57,13 +55,14 @@
 			<para>
 				These servers have to be on the same domain as the gadget server. You can configure the container in <filename>eXoGadgetServer:/WEB-INF/classes/containers/default/container.js</filename>.
 			</para>
-<programlisting>"gadgets.content-rewrite" : {
-  "include-urls": ".*",
-  "exclude-urls": "",
-  "include-tags": ["link", "script", "embed", "img", "style"],
-  "expires": "86400",
-  "proxy-url": "http://localhost:8080/eXoGadgetServer/gadgets/proxy?url=",
-  "concat-url": "http://localhost:8080/eXoGadgetServer/gadgets/concat?"
+			
+<programlisting>&#34;gadgets.content-rewrite&#34; : {
+  &#34;include-urls&#34;: &#34;.*&#34;,
+  &#34;exclude-urls&#34;: &#34;&#34;,
+  &#34;include-tags&#34;: [&#34;link&#34;, &#34;script&#34;, &#34;embed&#34;, &#34;img&#34;, &#34;style&#34;],
+  &#34;expires&#34;: &#34;86400&#34;,
+  &#34;proxy-url&#34;: &#34;http://localhost:8080/eXoGadgetServer/gadgets/proxy?url=&#34;,
+  &#34;concat-url&#34;: &#34;http://localhost:8080/eXoGadgetServer/gadgets/concat?&#34;
 },
 </programlisting>
 		</section>

Modified: portal/trunk/docs/reference-guide/en/modules/portlets/AJAX_in_GateIn_Framework.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/portlets/AJAX_in_GateIn_Framework.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/portlets/AJAX_in_GateIn_Framework.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,19 +1,16 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-AJAX_Framework">
 	<title>AJAX Framework</title>
-		<para>
-			Ajax calls are easily managed in &PRODUCT;'s framework. Lines can be added to the relevant template file and java class. A simple Ajax update of a component does not require any JavaScript code to be written.
-		</para>
-	
+	<para>
+		Ajax calls are easily managed in &PRODUCT;&#39;s framework. Lines can be added to the relevant template file and java class. A simple Ajax update of a component does not require any JavaScript code to be written.
+	</para>
 	<section id="sect-Reference_Guide-AJAX_Framework-Portlet_Preparation">
 		<title>Portlet Preparation</title>
 		<para>
 			&PRODUCT; portlets can use specific <literal>ActionListener</literal>s to receive and process Ajax calls. To set a portlet up to recieve Ajax calls, follow this procedure:
-		</para>	
+		</para>
 		<procedure>
 			<step>
 				<para>
@@ -22,15 +19,15 @@
 				<para>
 					Example : <literal>ParentClass</literal> is the class being wrtitten in.
 				</para>
-						
-<programlisting>static public class SaveActionListener extends EventListener&lt;ParentClass&gt;
+				
+<programlisting>static public class SaveActionListener extends EventListener&#60;ParentClass&#62;
 </programlisting>
 			</step>
 			<step>
 				<para>
 					Declare this listener in the configuration of the portlet:
 				</para>
-					
+				
 <programlisting>listeners = ParentClass.SaveActionListener.class
 </programlisting>
 			</step>
@@ -41,19 +38,19 @@
 				<para>
 					For example; the configuration below is for <literal>UIAccountForm</literal>:
 				</para>
-						
+				
 <programlisting role="JAVA">...
 @ComponentConfig(
   lifecycle = UIFormLifecycle.class,
-  template =  "system:/groovy/webui/form/UIFormTabPane.gtmpl",
+  template =  &#34;system:/groovy/webui/form/UIFormTabPane.gtmpl&#34;,
   initParams = {   
     @ParamConfig(
-      name = "AccountTemplateConfigOption", 
-      value = "app:/WEB-INF/conf/uiconf/account/webui/component/model/AccountTemplateConfigOption.groovy"
+      name = &#34;AccountTemplateConfigOption&#34;, 
+      value = &#34;app:/WEB-INF/conf/uiconf/account/webui/component/model/AccountTemplateConfigOption.groovy&#34;
     ),
     @ParamConfig(
-      name = "help.UIAccountFormQuickHelp",
-      value = "app:/WEB-INF/conf/uiconf/account/webui/component/model/UIAccountFormQuickHelp.xhtml"
+      name = &#34;help.UIAccountFormQuickHelp&#34;,
+      value = &#34;app:/WEB-INF/conf/uiconf/account/webui/component/model/UIAccountFormQuickHelp.xhtml&#34;
     )
   },
   events = {
@@ -69,10 +66,9 @@
 				<para>
 					Create an <literal>execute</literal> method inside this class:
 				</para>
-					
-<programlisting>public void execute(Event&lt;ParentClass&gt; event) throws Exception
+				
+<programlisting>public void execute(Event&#60;ParentClass&#62; event) throws Exception
 </programlisting>
-
 				<para>
 					This method is called every time the listener gets an event from the client. Hence you can process this event in it, using the even attribute. Use it to get parameters from a form in your client, to modify the status of your portlet, etc.,
 				</para>
@@ -81,17 +77,17 @@
 				</para>
 				<itemizedlist>
 					<listitem>
-				
-<programlisting role="XML">String value = event.getRequestContext().getRequestParameter("name"); // to get a value from a form
+						
+<programlisting role="XML">String value = event.getRequestContext().getRequestParameter(&#34;name&#34;); // to get a value from a form
 </programlisting>
 					</listitem>
 					<listitem>
-				
+						
 <programlisting role="XML">ParentClass parent = event.getSource(); // to get the parent object (the portlet that threw and caugth the event)
 </programlisting>
 					</listitem>
 					<listitem>
-				
+						
 <programlisting role="XML">UIMyComponent portal = parent.getAncestorOfType(UIMyComponent.class); // to get  any node in the hierarchy of UIComponents
 </programlisting>
 					</listitem>
@@ -99,9 +95,9 @@
 			</step>
 			<step>
 				<para>
-					If your action has to update an element on your client's interface, you must call <emphasis role="bold">addUIComponentToUpdateByAjax() </emphasis> at the end of the <literal>execute</literal> method:
+					If your action has to update an element on your client&#39;s interface, you must call <emphasis role="bold">addUIComponentToUpdateByAjax() </emphasis> at the end of the <literal>execute</literal> method:
 				</para>
-						
+				
 <programlisting>event.getRequestContext().addUIComponentToUpdateByAjax(uicomponent);
 </programlisting>
 				<para>
@@ -119,6 +115,7 @@
 				</para>
 			</step>
 		</procedure>
+
 	</section>
 	
 	<section id="sect-Reference_Guide-AJAX_Framework-AJAX_in_Groovy">
@@ -131,8 +128,8 @@
 				<para>
 					Add the following code to the groovy template file associated with the appropriate portlet class ( <literal>ParentClass</literal> here):
 				</para>
-						
-<programlisting>uicomponent.event("YourOperation");
+				
+<programlisting>uicomponent.event(&#34;YourOperation&#34;);
 </programlisting>
 				<para>
 					<literal>YourOperation</literal> is the same as in the <literal>ActionListener</literal> class (save in our example above).
@@ -147,7 +144,7 @@
 				<para>
 					If your operation must update the content of a component, make sure that the target component is well rendered. The following is recommended:
 				</para>
-					
+				
 <programlisting>uicomponent.renderChild(UITargetComponent.class) ;
 </programlisting>
 			</step>
@@ -155,19 +152,20 @@
 				<para>
 					The <literal>uicomponent</literal> must be of the <literal>UITargetComponent</literal> type as the component class; 
 <programlisting>event.getRequestContext().addUIComponentToUpdateByAjax(uicomponent) ;
-</programlisting> 
-					will be updated when <literal>UITargetComponent</literal> is called. 
-				</para>	
-			</step>	
+</programlisting>
+					 will be updated when <literal>UITargetComponent</literal> is called.
+				</para>
+			</step>
 			<step>
 				<para>
 					If this component is not rendered by default, set its <literal>rendered</literal> attribute (in the constructor of the portlet) to false when the portlet loads:
 				</para>
-						
+				
 <programlisting>mycomponent.setRendered(false);
 </programlisting>
 			</step>
 		</procedure>
+
 	</section>
 	
 	<section id="sect-Reference_Guide-AJAX_Framework-How_JavaScript_works">
@@ -176,23 +174,27 @@
 			All javascript in &PRODUCT; is managed by the file <filename>02eXoresources:javascript/eXo/portal/PortalHttpRequest.js</filename>.
 		</para>
 		<para>
-			In this class, there are four functions/classes: 
+			In this class, there are four functions/classes:
 		</para>
-		<formalpara>
+		<formalpara id="form-Reference_Guide-How_JavaScript_works-PortletResponse">
 			<title>PortletResponse</title>
-			<para></para>
+			<para>
+			</para>
 		</formalpara>
-		<formalpara>
+		<formalpara id="form-Reference_Guide-How_JavaScript_works-PortalResponse">
 			<title>PortalResponse</title>
-			<para></para>
+			<para>
+			</para>
 		</formalpara>
-		<formalpara>
+		<formalpara id="form-Reference_Guide-How_JavaScript_works-AjaxRequest">
 			<title>AjaxRequest</title>
-			<para></para>
+			<para>
+			</para>
 		</formalpara>
-		<formalpara>
+		<formalpara id="form-Reference_Guide-How_JavaScript_works-HttpResponseHandler">
 			<title>HttpResponseHandler</title>
-			<para></para>
+			<para>
+			</para>
 		</formalpara>
 		<para>
 			and 6 functions:
@@ -200,25 +202,25 @@
 		<variablelist>
 			<varlistentry>
 				<term>ajaxGet(url, callback)</term>
-					<listitem>
-						<para>
-							This is the main entry method for every Ajax calls to the portal It is simply a dispatcher method that completes some <parameter>init</parameter> fields before calling the <literal>doRequest()</literal> method.
-						</para>
-					</listitem>
+				<listitem>
+					<para>
+						This is the main entry method for every Ajax calls to the portal It is simply a dispatcher method that completes some <parameter>init</parameter> fields before calling the <literal>doRequest()</literal> method.
+					</para>
+				</listitem>
 			</varlistentry>
 			<varlistentry>
 				<term>ajaxPost(formElement, callback)</term>
-					<listitem>
-						<para>
-							This method is called instead of an <literal>HTTP POST</literal> when, in an AJAX case, some manipulations are needed. Once the content of the form is placed into a string object, the call is delegated to the <literal>doRequest()</literal> method
-						</para>
-					</listitem>
+				<listitem>
+					<para>
+						This method is called instead of an <literal>HTTP POST</literal> when, in an AJAX case, some manipulations are needed. Once the content of the form is placed into a string object, the call is delegated to the <literal>doRequest()</literal> method
+					</para>
+				</listitem>
 			</varlistentry>
 			<varlistentry>
 				<term>doRequest(method, url, queryString, callback)</term>
-					<listitem>
-						<para>
-							The <literal>doRequest()</literal> method takes incoming request from <literal>ajaxGet</literal> and <literal>ajaxPost</literal> calls. The second argument is the URL to target on the server The third argument is the query string object which is created out of a form element, this value is null except when there is a POST request. 
+				<listitem>
+					<para>
+						The <literal>doRequest()</literal> method takes incoming request from <literal>ajaxGet</literal> and <literal>ajaxPost</literal> calls. The second argument is the URL to target on the server The third argument is the query string object which is created out of a form element, this value is null except when there is a POST request. 
 						<orderedlist>
 							<listitem>
 								<para>
@@ -227,36 +229,36 @@
 							</listitem>
 							<listitem>
 								<para>
-									An <literal>HttpResponseHandler</literal> object is instantiated and its methods  (<literal>ajaxResponse</literal>, <literal>ajaxLoading</literal>, <literal>ajaxTimeout</literal>) are associated with the one from the <literal>AjaxRequest</literal> and will be called by the XHR during the process method.
+									An <literal>HttpResponseHandler</literal> object is instantiated and its methods (<literal>ajaxResponse</literal>, <literal>ajaxLoading</literal>, <literal>ajaxTimeout</literal>) are associated with the one from the <literal>AjaxRequest</literal> and will be called by the XHR during the process method.
 								</para>
 							</listitem>
 						</orderedlist>
-						</para>
-					</listitem>
+					</para>
+				</listitem>
 			</varlistentry>
 			<varlistentry>
 				<term>ajaxAbort()</term>
-					<listitem>
-						<para>
-							Cancels the current request.
-						</para>
-					</listitem>
+				<listitem>
+					<para>
+						Cancels the current request.
+					</para>
+				</listitem>
 			</varlistentry>
 			<varlistentry>
 				<term>ajaxAsyncGetRequest(url, async)</term>
-					<listitem>
-						<para>
-							Allows to create and execute a sync or async GET request.
-						</para>
-					</listitem>
+				<listitem>
+					<para>
+						Allows to create and execute a sync or async GET request.
+					</para>
+				</listitem>
 			</varlistentry>
 			<varlistentry>
 				<term>ajaxRedirect(url)</term>
-					<listitem>
-						<para>
-							A simple javascript redirection with <literal>window.location.href</literal> that are the entry points of these classes. These functions need not be called explicitly, as the template file and the portlet class manage everything.
-						</para>
-					</listitem>
+				<listitem>
+					<para>
+						A simple javascript redirection with <literal>window.location.href</literal> that are the entry points of these classes. These functions need not be called explicitly, as the template file and the portlet class manage everything.
+					</para>
+				</listitem>
 			</varlistentry>
 		</variablelist>
 	</section>
@@ -264,7 +266,7 @@
 	<section id="sect-Reference_Guide-AJAX_Framework-PortletResponse">
 		<title>PortletResponse</title>
 		<para>
-			This class doesn't contain any methods. On creation, it retrieves the response elements from the xml returned by Ajax, and stores them in the corresponding attributes :
+			This class doesn&#39;t contain any methods. On creation, it retrieves the response elements from the xml returned by Ajax, and stores them in the corresponding attributes :
 		</para>
 		<variablelist>
 			<varlistentry>
@@ -285,43 +287,43 @@
 			</varlistentry>
 			<varlistentry>
 				<term>portletMode</term>
-					<listitem>
-						<para>
-							The mode the component runs in. The options are: View, Edit, Help or Config.
-						</para>
-					</listitem>
+				<listitem>
+					<para>
+						The mode the component runs in. The options are: View, Edit, Help or Config.
+					</para>
+				</listitem>
 			</varlistentry>
 			<varlistentry>
 				<term>portletState</term>
-					<listitem>
-						<para>
-							The processing state of the component. The options are: Decode, Render.
-						</para>
-					</listitem>
+				<listitem>
+					<para>
+						The processing state of the component. The options are: Decode, Render.
+					</para>
+				</listitem>
 			</varlistentry>
 			<varlistentry>
 				<term>portletData</term>
-					<listitem>
-						<para>
-							The updated data to put in the component.
-						</para>
-					</listitem>
+				<listitem>
+					<para>
+						The updated data to put in the component.
+					</para>
+				</listitem>
 			</varlistentry>
 			<varlistentry>
 				<term>script</term>
-					<listitem>
-						<para>
-							The javascript code to update the component.
-						</para>
-					</listitem>
+				<listitem>
+					<para>
+						The javascript code to update the component.
+					</para>
+				</listitem>
 			</varlistentry>
 			<varlistentry>
-				<term>blocksToUpdate</term> 
-					<listitem>
-						<para>
-							An array containing the containers to update with this script.
-						</para>
-					</listitem>
+				<term>blocksToUpdate</term>
+				<listitem>
+					<para>
+						An array containing the containers to update with this script.
+					</para>
+				</listitem>
 			</varlistentry>
 		</variablelist>
 		<para>
@@ -335,22 +337,22 @@
 			This is an array of <literal>PortletResponse</literal>s (<literal>portletResponses</literal>) and two other attributes:
 		</para>
 		<variablelist>
-		  <varlistentry>
-			<term>data</term>
-			<listitem>
-				<para>
-					Data to update.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>script</term>
-			<listitem>
-				<para>
-					Javascript code to update.
-				</para>
-			</listitem>
-		</varlistentry>
+			<varlistentry>
+				<term>data</term>
+				<listitem>
+					<para>
+						Data to update.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>script</term>
+				<listitem>
+					<para>
+						Javascript code to update.
+					</para>
+				</listitem>
+			</varlistentry>
 		</variablelist>
 	</section>
 	
@@ -367,78 +369,78 @@
 			This class provides methods to handle the Ajax response.
 		</para>
 		<variablelist>
-		  <varlistentry>
-			<term>executeScript</term>
-			<listitem>
-				<para>
-					Used to execute javascript code.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>updateBlocks</term>
-			<listitem>
-				<para>
-					Updates <literal>html</literal> components.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>ajaxTimeout</term>
-			<listitem>
-				<para>
-					This function is called when the timeout of the ajax call exceeds its set limit.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>ajaxResponse</term>
-			<listitem>
-				<para>
-					This function creates a <literal>PortalResponse</literal> object from the data in the Ajax request.
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>ajaxLoading</term>
-			<listitem>
-				<para>
-					This function shows the loading pop-up and mask layer.
-				</para>
-			</listitem>
-		</varlistentry>
+			<varlistentry>
+				<term>executeScript</term>
+				<listitem>
+					<para>
+						Used to execute javascript code.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>updateBlocks</term>
+				<listitem>
+					<para>
+						Updates <literal>html</literal> components.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>ajaxTimeout</term>
+				<listitem>
+					<para>
+						This function is called when the timeout of the ajax call exceeds its set limit.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>ajaxResponse</term>
+				<listitem>
+					<para>
+						This function creates a <literal>PortalResponse</literal> object from the data in the Ajax request.
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>ajaxLoading</term>
+				<listitem>
+					<para>
+						This function shows the loading pop-up and mask layer.
+					</para>
+				</listitem>
+			</varlistentry>
 		</variablelist>
-
-		<formalpara>
-		<title>Portal Ajax Response Data Structure:</title>
+		<formalpara id="form-Reference_Guide-HttpResponseHandler-Portal_Ajax_Response_Data_Structure">
+			<title>Portal Ajax Response Data Structure:</title>
 			<para>
+				
 <programlisting>{PortalResponse}
   |
-  |---&gt;{PortletResponse}
+  |---&#62;{PortletResponse}
   |
-  |---&gt;{PortletResponse}
-  |          |--&gt;{portletId}
-  |          |--&gt;{portletTitle}
-  |          |--&gt;{portletMode}
-  |          |--&gt;{portletState}
+  |---&#62;{PortletResponse}
+  |          |--&#62;{portletId}
+  |          |--&#62;{portletTitle}
+  |          |--&#62;{portletMode}
+  |          |--&#62;{portletState}
   |          |
-  |          |--&gt;{Data}
+  |          |--&#62;{Data}
   |          |      |
-  |          |      |---&gt;{BlockToUpdate}
-  |          |      |         |--&gt;{blockId}
-  |          |      |         |--&gt;{data}
+  |          |      |---&#62;{BlockToUpdate}
+  |          |      |         |--&#62;{blockId}
+  |          |      |         |--&#62;{data}
   |          |      |
-  |          |      |---&gt;{BlockToUpdate}
-  |          |---&gt;{Script}
+  |          |      |---&#62;{BlockToUpdate}
+  |          |---&#62;{Script}
   |
-  |---&gt;{Data}
+  |---&#62;{Data}
   |      |
-  |      |---&gt;{BlockToUpdate}
-  |      |         |--&gt;{blockId}
-  |      |         |--&gt;{data}
+  |      |---&#62;{BlockToUpdate}
+  |      |         |--&#62;{blockId}
+  |      |         |--&#62;{data}
   |      |
-  |      |---&gt;{BlockToUpdate}
-  |---&gt;{Script}
+  |      |---&#62;{BlockToUpdate}
+  |---&#62;{Script}
 </programlisting>
 			</para>
 		</formalpara>
@@ -454,6 +456,7 @@
 				<para>
 					Create a <literal>UIPopupAction</literal> in the main portlet class:
 				</para>
+				
 <programlisting>addChild(UIPopupAction.class, null, null);
 </programlisting>
 			</step>
@@ -461,9 +464,9 @@
 				<para>
 					Render this action in your template file:
 				</para>
+				
 <programlisting>uicomponent.renderChild(UIPopupAction.class) ;
 </programlisting>
-
 				<para>
 					(This creates an empty container (pop-up) that will receive the new content by Ajax)
 				</para>
@@ -472,12 +475,13 @@
 				<para>
 					Put this component in your action listener class and update its content:
 				</para>
+				
 <programlisting>UIPopupAction uiPopupAction = uiMainPortlet.getChild(UIPopupAction.class) ;
 uiPopupAction.activate(UIReferencesList.class, 600) ;
 </programlisting>
 				<para>
-					<literal>UIReferenceList</literal> is the component that will appear in the pop-up. It does not have to declared in the main portlet class. 
-				</para>	
+					<literal>UIReferenceList</literal> is the component that will appear in the pop-up. It does not have to declared in the main portlet class.
+				</para>
 				<para>
 					The activate method creates the component and its rendering in the pop-up window.
 				</para>
@@ -486,6 +490,7 @@
 				<para>
 					Allow this component to be updated by Ajax:
 				</para>
+				
 <programlisting>event.getRequestContext().addUIComponentToUpdateByAjax(uiPopupAction) ;
 </programlisting>
 			</step>
@@ -495,6 +500,7 @@
 				</para>
 			</step>
 		</procedure>
+
 	</section>
 
 </section>

Modified: portal/trunk/docs/reference-guide/en/modules/portlets/Create_a_WebUI_Portlet.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/portlets/Create_a_WebUI_Portlet.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/portlets/Create_a_WebUI_Portlet.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,19 +1,17 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Create_a_WebUI_Portlet">
 	<title>Create a WebUI Portlet</title>
 	<section id="sect-Reference_Guide-Create_a_WebUI_Portlet-Overview">
-	<title>Overview</title>
-	<important>
-		<title>TODO</title>
+		<title>Overview</title>
+		<important>
+			<title>TODO</title>
+			<para>
+				Create example (This one doesn&#39;t exist anymore). Overall this chapter need to be reviewed, any taker ? :)
+			</para>
+		</important>
 		<para>
-			Create example (This one doesn't exist anymore). Overall this chapter need to be reviewed, any taker ? :)
-		</para>
-	</important>
-		<para>
 			This example is based on the <literal>testPortlet</literal> in <filename>portal/trunk/portlet/test</filename>.
 		</para>
 	</section>
@@ -40,36 +38,36 @@
 				Create the pom.xml, at root level of the project, like this :
 			</para>
 			
-<programlisting role="XML">&lt;project&gt;
-  &lt;parent&gt;
-    &lt;groupId&gt;org.exoplatform.portal&lt;/groupId&gt;
-    &lt;artifactId&gt;config&lt;/artifactId&gt;
-    &lt;version&gt;trunk&lt;/version&gt;
-  &lt;/parent&gt;
-  &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
-  &lt;artifactId&gt;org.gatein.example.portlet.testRomain&lt;/artifactId&gt;
-  &lt;packaging&gt;war&lt;/packaging&gt;
-  &lt;version&gt;1.0.0&lt;/version&gt;
-  &lt;name&gt;gatein.portlets.testRomain&lt;/name&gt;
-  &lt;description&gt;Romain Test Portlet&lt;/description&gt;
-  &lt;dependencies&gt;
-    &lt;dependency&gt;
-      &lt;groupId&gt;org.exoplatform.portal&lt;/groupId&gt;
-      &lt;artifactId&gt;exo.portal.webui.portal&lt;/artifactId&gt;
-      &lt;version&gt;${org.exoplatform.portal.version}&lt;/version&gt;
-      &lt;scope&gt;provided&lt;/scope&gt;
-    &lt;/dependency&gt;
-    &lt;dependency&gt;
-      &lt;groupId&gt;org.exoplatform.portal&lt;/groupId&gt;
-      &lt;artifactId&gt;exo.portal.webui.eXo&lt;/artifactId&gt;
-      &lt;version&gt;${org.exoplatform.portal.version}&lt;/version&gt;
-      &lt;scope&gt;provided&lt;/scope&gt;
-    &lt;/dependency&gt;
-  &lt;/dependencies&gt;
-  &lt;build&gt;
-    &lt;finalName&gt;testRomain&lt;/finalName&gt;
-  &lt;/build&gt;
-&lt;/project&gt;
+<programlisting role="XML">&#60;project&#62;
+  &#60;parent&#62;
+    &#60;groupId&#62;org.exoplatform.portal&#60;/groupId&#62;
+    &#60;artifactId&#62;config&#60;/artifactId&#62;
+    &#60;version&#62;trunk&#60;/version&#62;
+  &#60;/parent&#62;
+  &#60;modelVersion&#62;4.0.0&#60;/modelVersion&#62;
+  &#60;artifactId&#62;org.gatein.example.portlet.testRomain&#60;/artifactId&#62;
+  &#60;packaging&#62;war&#60;/packaging&#62;
+  &#60;version&#62;1.0.0&#60;/version&#62;
+  &#60;name&#62;gatein.portlets.testRomain&#60;/name&#62;
+  &#60;description&#62;Romain Test Portlet&#60;/description&#62;
+  &#60;dependencies&#62;
+    &#60;dependency&#62;
+      &#60;groupId&#62;org.exoplatform.portal&#60;/groupId&#62;
+      &#60;artifactId&#62;exo.portal.webui.portal&#60;/artifactId&#62;
+      &#60;version&#62;${org.exoplatform.portal.version}&#60;/version&#62;
+      &#60;scope&#62;provided&#60;/scope&#62;
+    &#60;/dependency&#62;
+    &#60;dependency&#62;
+      &#60;groupId&#62;org.exoplatform.portal&#60;/groupId&#62;
+      &#60;artifactId&#62;exo.portal.webui.eXo&#60;/artifactId&#62;
+      &#60;version&#62;${org.exoplatform.portal.version}&#60;/version&#62;
+      &#60;scope&#62;provided&#60;/scope&#62;
+    &#60;/dependency&#62;
+  &#60;/dependencies&#62;
+  &#60;build&#62;
+    &#60;finalName&#62;testRomain&#60;/finalName&#62;
+  &#60;/build&#62;
+&#60;/project&#62;
 </programlisting>
 		</section>
 		
@@ -86,7 +84,7 @@
 //this part is configuration of the portlet, we set the path to the template groovy.
  @ComponentConfig(
     lifecycle = UIApplicationLifecycle.class,
-    template = "app:/groovy/testRomain/portlet/UITestRomainPortlet.gtmpl"
+    template = &#34;app:/groovy/testRomain/portlet/UITestRomainPortlet.gtmpl&#34;
   )
 public class UITestRomainPortlet extends UIPortletApplication {
  
@@ -96,7 +94,7 @@
 </programlisting>
 		</section>
 		
-		<!--  
+		<!--   
 	<section id="sect-Reference_Guide-Create_a_WebUI_Portlet-testRomain.xml">
 		<title>testRomain.xml</title>
 		<para>
@@ -107,45 +105,45 @@
 			docBase must be set to webapp path of the portlet when you are in the tomcat bin directory.
 		</para>
 	</section>
-	  -->
+	   -->
 		<section id="sect-Reference_Guide-Configure_the_portlet-Portlet_Groovy_Template">
 			<title>Portlet Groovy Template</title>
 			<para>
 				In src/main/webapp, create the groovy template for the portlet. The path to this file must match the path you set in the java file, in our case : groovy/testRomain/portlet/UITestRomainPortlet.gtmpl
 			</para>
 			
-<programlisting role="HTML">&lt;div id="&lt;%=uicomponent.getId();%&gt;"&gt;
+<programlisting role="HTML">&#60;div id=&#34;&#60;%=uicomponent.getId();%&#62;&#34;&#62;
 	HelloWorld
-&lt;/div&gt;
+&#60;/div&#62;
 </programlisting>
 		</section>
 		
 		<section id="sect-Reference_Guide-Configure_the_portlet-Skin_Folder">
 			<title>Skin Folder</title>
 			<para>
-				Create the folder skin in src/main/webapp. We don't fill it now, but in this folder, you can put css stylesheet and images.
+				Create the folder skin in src/main/webapp. We don&#39;t fill it now, but in this folder, you can put css stylesheet and images.
 			</para>
 		</section>
 		
 		<section id="sect-Reference_Guide-Configure_the_portlet-Locale_Folder">
 			<title>Locale Folder</title>
 			<para>
-				Create the folder WEB-INF/classes/locale in src/main/webapp. We don't fill it now, but in this folder, you can put language properties files. See <xref linkend="sect-Reference_Guide-Internationalization_Configuration" />.
+				Create the folder WEB-INF/classes/locale in src/main/webapp. We don&#39;t fill it now, but in this folder, you can put language properties files. See <xref linkend="sect-Reference_Guide-Internationalization_Configuration" />.
 			</para>
 		</section>
 		
 		<section id="sect-Reference_Guide-Configure_the_portlet-configuration.xml">
 			<title>configuration.xml</title>
 			<para>
-				Create the file configuration.xml in WEB-INF/conf/portlet/testPortletRomain/. Content of tag &lt;ui-component-root&gt; must match your package organization.
+				Create the file configuration.xml in WEB-INF/conf/portlet/testPortletRomain/. Content of tag &#60;ui-component-root&#62; must match your package organization.
 			</para>
 			
-<programlisting role="XML">&lt;webui-configuration&gt;   
-  &lt;application&gt;     
-    &lt;ui-component-root&gt;testRomain.portlet.component.UITestRomainPortlet&lt;/ui-component-root&gt;
-    &lt;state-manager&gt;org.exoplatform.webui.application.portlet.ParentAppStateManager&lt;/state-manager&gt;
-  &lt;/application&gt;
-&lt;/webui-configuration&gt;
+<programlisting role="XML">&#60;webui-configuration&#62;   
+  &#60;application&#62;     
+    &#60;ui-component-root&#62;testRomain.portlet.component.UITestRomainPortlet&#60;/ui-component-root&#62;
+    &#60;state-manager&#62;org.exoplatform.webui.application.portlet.ParentAppStateManager&#60;/state-manager&#62;
+  &#60;/application&#62;
+&#60;/webui-configuration&#62;
 </programlisting>
 		</section>
 		
@@ -155,34 +153,34 @@
 				In WEB-INF, create file portlet.xml :
 			</para>
 			
-<programlisting role="XML">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"&gt; 
-  &lt;portlet&gt;
-    &lt;description xml:lang="EN"&gt;Test Portlet Romain&lt;/description&gt;
-    &lt;portlet-name&gt;TestRomain&lt;/portlet-name&gt;
-    &lt;display-name xml:lang="EN"&gt;Test Portlet Romain&lt;/display-name&gt;
-    &lt;portlet-class&gt;org.exoplatform.webui.application.portlet.PortletApplicationController&lt;/portlet-class&gt;
-    &lt;init-param&gt;
-      &lt;name&gt;webui.configuration&lt;/name&gt;
-      &lt;!-- must match the path to configuration file --&gt;
-      &lt;value&gt;/WEB-INF/conf/portlet/testPortletRomain/configuration.xml&lt;/value&gt;
-    &lt;/init-param&gt;    
-    &lt;expiration-cache&gt;0&lt;/expiration-cache&gt;
-    &lt;supports&gt;
-      &lt;mime-type&gt;text/html&lt;/mime-type&gt;
-      &lt;portlet-mode&gt;help&lt;/portlet-mode&gt;
-    &lt;/supports&gt;
-    &lt;supported-locale&gt;en&lt;/supported-locale&gt;
-    &lt;resource-bundle&gt;locale.testRomainPortlet&lt;/resource-bundle&gt;     
-    &lt;portlet-info&gt;
-      &lt;title&gt;TestPortletRomain&lt;/title&gt;
-      &lt;short-title&gt;TestPortlet&lt;/short-title&gt;
-      &lt;keywords&gt;test&lt;/keywords&gt;
-    &lt;/portlet-info&gt;     
-  &lt;/portlet&gt;
-&lt;/portlet-app&gt;
+<programlisting role="XML">&#60;?xml version=&#34;1.0&#34; encoding=&#34;UTF-8&#34;?&#62;
+&#60;portlet-app version=&#34;1.0&#34; xmlns=&#34;http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd&#34;
+             xmlns:xsi=&#34;http://www.w3.org/2001/XMLSchema-instance&#34;
+             xsi:schemaLocation=&#34;http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd&#34;&#62; 
+  &#60;portlet&#62;
+    &#60;description xml:lang=&#34;EN&#34;&#62;Test Portlet Romain&#60;/description&#62;
+    &#60;portlet-name&#62;TestRomain&#60;/portlet-name&#62;
+    &#60;display-name xml:lang=&#34;EN&#34;&#62;Test Portlet Romain&#60;/display-name&#62;
+    &#60;portlet-class&#62;org.exoplatform.webui.application.portlet.PortletApplicationController&#60;/portlet-class&#62;
+    &#60;init-param&#62;
+      &#60;name&#62;webui.configuration&#60;/name&#62;
+      &#60;!-- must match the path to configuration file --&#62;
+      &#60;value&#62;/WEB-INF/conf/portlet/testPortletRomain/configuration.xml&#60;/value&#62;
+    &#60;/init-param&#62;    
+    &#60;expiration-cache&#62;0&#60;/expiration-cache&#62;
+    &#60;supports&#62;
+      &#60;mime-type&#62;text/html&#60;/mime-type&#62;
+      &#60;portlet-mode&#62;help&#60;/portlet-mode&#62;
+    &#60;/supports&#62;
+    &#60;supported-locale&#62;en&#60;/supported-locale&#62;
+    &#60;resource-bundle&#62;locale.testRomainPortlet&#60;/resource-bundle&#62;     
+    &#60;portlet-info&#62;
+      &#60;title&#62;TestPortletRomain&#60;/title&#62;
+      &#60;short-title&#62;TestPortlet&#60;/short-title&#62;
+      &#60;keywords&#62;test&#60;/keywords&#62;
+    &#60;/portlet-info&#62;     
+  &#60;/portlet&#62;
+&#60;/portlet-app&#62;
 </programlisting>
 		</section>
 		
@@ -192,25 +190,25 @@
 				In WEB-INF, create file web.xml :
 			</para>
 			
-<programlisting role="XML">&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
-&lt;!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"&gt;
-&lt;web-app&gt; 
-  &lt;!-If define the Portlet Application name MUST end with .par-&gt; 
-  &lt;display-name&gt;test&lt;/display-name&gt;
-  &lt;description&gt; This application is a portlet. It can not be used outside a portal. 
-  This web.xml file is mandatory in each .par archive file. &lt;/description&gt;
-  &lt;listener&gt; 
-    &lt;listener-class&gt;org.exoplatform.services.portletcontainer.impl.servlet.PortletApplicationListener&lt;/listener-class&gt;
-  &lt;/listener&gt;
-  &lt;servlet&gt;
-    &lt;servlet-name&gt;PortletWrapper&lt;/servlet-name&gt;
-	&lt;servlet-class&gt;org.exoplatform.services.portletcontainer.impl.servlet.ServletWrapper&lt;/servlet-class&gt;
-  &lt;/servlet&gt;
-  &lt;servlet-mapping&gt;
-    &lt;servlet-name&gt;PortletWrapper&lt;/servlet-name&gt;
-	&lt;url-pattern&gt;/PortletWrapper&lt;/url-pattern&gt;
-  &lt;/servlet-mapping&gt;
-&lt;/web-app&gt;
+<programlisting role="XML">&#60;?xml version=&#34;1.0&#34; encoding=&#34;ISO-8859-1&#34;?&#62;
+&#60;!DOCTYPE web-app PUBLIC &#34;-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN&#34; &#34;http://java.sun.com/dtd/web-app_2_3.dtd&#34;&#62;
+&#60;web-app&#62; 
+  &#60;!-If define the Portlet Application name MUST end with .par-&#62; 
+  &#60;display-name&#62;test&#60;/display-name&#62;
+  &#60;description&#62; This application is a portlet. It can not be used outside a portal. 
+  This web.xml file is mandatory in each .par archive file. &#60;/description&#62;
+  &#60;listener&#62; 
+    &#60;listener-class&#62;org.exoplatform.services.portletcontainer.impl.servlet.PortletApplicationListener&#60;/listener-class&#62;
+  &#60;/listener&#62;
+  &#60;servlet&#62;
+    &#60;servlet-name&#62;PortletWrapper&#60;/servlet-name&#62;
+	&#60;servlet-class&#62;org.exoplatform.services.portletcontainer.impl.servlet.ServletWrapper&#60;/servlet-class&#62;
+  &#60;/servlet&#62;
+  &#60;servlet-mapping&#62;
+    &#60;servlet-name&#62;PortletWrapper&#60;/servlet-name&#62;
+	&#60;url-pattern&#62;/PortletWrapper&#60;/url-pattern&#62;
+  &#60;/servlet-mapping&#62;
+&#60;/web-app&#62;
 </programlisting>
 		</section>
 
@@ -230,21 +228,21 @@
 				In the groovy template, add this code :
 			</para>
 			
-<programlisting role="HTML">&lt;div class="UIAction"&gt; 
-  &lt;div class="ActionContainer"&gt;
-    &lt;div class="ActionButton"&gt; 
-      &lt;div class="LightBlueStyle"&gt;
-        &lt;div class="ButtonLeft"&gt;
-          &lt;div class="ButtonRight"&gt;
-            &lt;div class="ButtonMiddle"&gt;
-              &lt;a href="&lt;%=uicomponent.event("OpenPopup", "")%&gt;"&gt;Open Popup&lt;/a&gt;
-            &lt;/div&gt;
-          &lt;/div&gt;
-        &lt;/div&gt;
-      &lt;/div&gt;
-    &lt;/div&gt;
-  &lt;/div&gt; 
-&lt;/div&gt;
+<programlisting role="HTML">&#60;div class=&#34;UIAction&#34;&#62; 
+  &#60;div class=&#34;ActionContainer&#34;&#62;
+    &#60;div class=&#34;ActionButton&#34;&#62; 
+      &#60;div class=&#34;LightBlueStyle&#34;&#62;
+        &#60;div class=&#34;ButtonLeft&#34;&#62;
+          &#60;div class=&#34;ButtonRight&#34;&#62;
+            &#60;div class=&#34;ButtonMiddle&#34;&#62;
+              &#60;a href=&#34;&#60;%=uicomponent.event(&#34;OpenPopup&#34;, &#34;&#34;)%&#62;&#34;&#62;Open Popup&#60;/a&#62;
+            &#60;/div&#62;
+          &#60;/div&#62;
+        &#60;/div&#62;
+      &#60;/div&#62;
+    &#60;/div&#62;
+  &#60;/div&#62; 
+&#60;/div&#62;
 </programlisting>
 		</section>
 		
@@ -262,9 +260,9 @@
 				Remark : XXXActionLister.class XXX must match the name you set for the event in the groovy.
 			</para>
 			
-<programlisting role="JAVA">static public class OpenPopupActionListener extends EventListener&lt;UITestRomainPortlet&gt; {
-    public void execute(Event&lt;UITestRomainPortlet&gt; event) throws Exception {
-        System.out.println("HelloWorld");
+<programlisting role="JAVA">static public class OpenPopupActionListener extends EventListener&#60;UITestRomainPortlet&#62; {
+    public void execute(Event&#60;UITestRomainPortlet&#62; event) throws Exception {
+        System.out.println(&#34;HelloWorld&#34;);
     }
 }
 </programlisting>
@@ -273,24 +271,24 @@
 		<section id="sect-Reference_Guide-Use_the_Portlet-Redeploy">
 			<title>Redeploy</title>
 			<para>
-				Redeploy the portlet and click on the button. You will see "HelloWorld" in your console. If you don't change in the portlet, try to redeploy and reboot the tomcat server.
+				Redeploy the portlet and click on the button. You will see &#34;HelloWorld&#34; in your console. If you don&#39;t change in the portlet, try to redeploy and reboot the tomcat server.
 			</para>
 		</section>
 
 	</section>
 	
 	<section id="sect-Reference_Guide-Create_a_WebUI_Portlet-Add_a_HelloWorld_popup">
-		<title>Add a "HelloWorld" popup</title>
+		<title>Add a &#34;HelloWorld&#34; popup</title>
 		<para>
-			Now, we will add a popup which say "HelloWorld" when you click on the button.
+			Now, we will add a popup which say &#34;HelloWorld&#34; when you click on the button.
 		</para>
 		<para>
 			First, create the groovy template of the popup : in webapp/groovy/testRomain/portlet, create UIHelloWorldPopupContent.gtmpl :
 		</para>
 		
-<programlisting role="HTML">&lt;div id="&lt;%=uicomponent.getId();%&gt;"&gt;
+<programlisting role="HTML">&#60;div id=&#34;&#60;%=uicomponent.getId();%&#62;&#34;&#62;
 	HelloWorld in a popup
-&lt;/div&gt;
+&#60;/div&#62;
 </programlisting>
 		<para>
 			In java/testRomain/portlet/component, create the java file for the popup look like : {code} package testRomain.portlet.component;
@@ -303,7 +301,7 @@
 
 @ComponentConfig(
    lifecycle = UIApplicationLifecycle.class,
-   template = "app:/groovy/testRomain/portlet/UIHelloWorldPopupContent.gtmpl"
+   template = &#34;app:/groovy/testRomain/portlet/UIHelloWorldPopupContent.gtmpl&#34;
   )
 public class UIHelloWorldPopupContent extends UIComponent {
 
@@ -328,7 +326,7 @@
 			At the beginning, we set the popup not visible. As you see, we add a children to the Portlet. So, if we want to see the content of it, we must add this in UITestPortletRomain.gtmpl :
 		</para>
 		
-<programlisting>&lt;% uicomponent.renderChildren(); %&gt;
+<programlisting>&#60;% uicomponent.renderChildren(); %&#62;
 </programlisting>
 		<para>
 			This makes the portlet generate the content of all child components.
@@ -337,8 +335,8 @@
 			Change the treatment of the event, replace the println by :
 		</para>
 		
-<programlisting role="JAVA">public static class OpenPopupActionListener extends EventListener&lt;UITestRomainPortlet&gt; {
-  public void execute(Event&lt;UITestRomainPortlet&gt; event) throws Exception {
+<programlisting role="JAVA">public static class OpenPopupActionListener extends EventListener&#60;UITestRomainPortlet&#62; {
+  public void execute(Event&#60;UITestRomainPortlet&#62; event) throws Exception {
     UITestRomainPortlet portlet = event.getSource();
     UIPopupWindow popup = portlet.getChild(UIPopupWindow.class);
     popup.setRendered(true);
@@ -350,7 +348,7 @@
 			When user clicks on the button, the popup is shown.
 		</para>
 		<para>
-			Redeploy the portlet and click on the button. You will see "HelloWorld in a popup" in a popup. If you don't change in the portlet, try to redeploy and reboot the tomcat server.
+			Redeploy the portlet and click on the button. You will see &#34;HelloWorld in a popup&#34; in a popup. If you don&#39;t change in the portlet, try to redeploy and reboot the tomcat server.
 		</para>
 	</section>
 

Modified: portal/trunk/docs/reference-guide/en/modules/portlets/Groovy_Templates.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/portlets/Groovy_Templates.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/portlets/Groovy_Templates.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,14 +1,11 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Groovy_Templates">
 	<title>Groovy Templates</title>
-		<para>
-			In addition to the content in this chapter, refer also to <xref linkend="sect-Reference_Guide-AJAX_Framework" /> in order to better understand the communication between the Groovy Template and the portlet.
-		</para>
-	
+	<para>
+		In addition to the content in this chapter, refer also to <xref linkend="sect-Reference_Guide-AJAX_Framework" /> in order to better understand the communication between the Groovy Template and the portlet.
+	</para>
 	<section id="sect-Reference_Guide-Groovy_Templates-Basic_structure">
 		<title>Basic structure</title>
 		<para>
@@ -22,77 +19,76 @@
 			</listitem>
 			<listitem>
 				<para>
-					zero or more groovy language code blocks, enclosed by &lt;% ... %&gt; enclosures.
+					zero or more groovy language code blocks, enclosed by &#60;% ... %&#62; enclosures.
 				</para>
 			</listitem>
 		</orderedlist>
 		<para>
-			The HTML code in the template doesn't have to contain the <literal>html</literal>, or <literal>body</literal> tags. This allows groovy templates for one component to also be rendered in another component.
+			The HTML code in the template doesn&#39;t have to contain the <literal>html</literal>, or <literal>body</literal> tags. This allows groovy templates for one component to also be rendered in another component.
 		</para>
 		<para>
 			For example:
 		</para>
 		
-<programlisting role="HTML">&lt;!DOCTYPE html 
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"&gt;
-&lt;%
+<programlisting role="HTML">&#60;!DOCTYPE html 
+    PUBLIC &#34;-//W3C//DTD XHTML 1.0 Strict//EN&#34;
+           &#34;http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd&#34;&#62;
+&#60;%
   import org.exoplatform.webui.core.UIComponent;
   def currentPage = uicomponent.getCurrentPage();
   ... 
-%&gt;
+%&#62;
   ...
-  &lt;div class="$uicomponent.skin" id="UIPortalApplication"&gt;
-    &lt;%uicomponent.renderChildren();%&gt;
-  &lt;/div&gt;
+  &#60;div class=&#34;$uicomponent.skin&#34; id=&#34;UIPortalApplication&#34;&#62;
+    &#60;%uicomponent.renderChildren();%&#62;
+  &#60;/div&#62;
 </programlisting>
 	</section>
 	
 	<section id="sect-Reference_Guide-Groovy_Templates-Groovy_language">
 		<title>Groovy language</title>
 		<para>
-			Groovy is a scripting language for Java. Some usage examples are included in this section, however further information is available at <ulink url="http://groovy.codehaus.org/Documentation"></ulink> .
+			Groovy is a scripting language for Java. Some usage examples are included in this section, however further information is available at <ulink url="http://groovy.codehaus.org/Documentation" /> .
 		</para>
-		<variablelist>
+		<variablelist id="vari-Reference_Guide-Groovy_language-Some_examples_of_Groovy">
 			<title>Some examples of Groovy</title>
-		<varlistentry>
-			<term>Variables definition</term>
-			<listitem>
-				<para>
+			<varlistentry>
+				<term>Variables definition</term>
+				<listitem>
+					<para>
+						
 <programlisting>int min = 1;
 def totalPage = uicomponent.getAvailablePage();
-String name = "uiPortlet";
+String name = &#34;uiPortlet&#34;;
 categories = uicomponent.getItemCategories();
 String columns = uicomponent.getColumns();
 </programlisting>
-				</para>
-			</listitem>
-		</varlistentry>
-		<varlistentry>
-			<term>Other expressions</term>
-			<listitem>
-				<para>
+					</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term>Other expressions</term>
+				<listitem>
+					<para>
+						
 <programlisting>for(category in categories) { ... }
 for(i in min..max) { ... } // min and max are int variables
-println "&lt;/div&gt;" ;
-println """
-  &lt;div class="Item"&gt;
-    &lt;div class="OverflowContainer"&gt;
-""";
-&lt;%=uicomponent.getToolbarStyle();%&gt; // &lt;%= to avoid a call of println method
+println &#34;&#60;/div&#62;&#34; ;
+println &#34;&#34;&#34;
+  &#60;div class=&#34;Item&#34;&#62;
+    &#60;div class=&#34;OverflowContainer&#34;&#62;
+&#34;&#34;&#34;;
+&#60;%=uicomponent.getToolbarStyle();%&#62; // &#60;%= to avoid a call of println method
 import org.exoplatform.portal.config.model.PageNode;
 </programlisting>
-
-				</para>
-			</listitem>
-		</varlistentry>
-		</variablelist>	
-
+					</para>
+				</listitem>
+			</varlistentry>
+		</variablelist>
 	</section>
 	
 	<section id="sect-Reference_Guide-Groovy_Templates-Linking_a_portlet_with_a_template">
 		<title>Linking a portlet with a template</title>
-
 		<section id="sect-Reference_Guide-Linking_a_portlet_with_a_template-Portlet_configuration">
 			<title>Portlet configuration</title>
 			<para>
@@ -110,7 +106,7 @@
 			
 <programlisting>@ComponentConfig(
   lifecycle = UIFormLifecycle.class,
-  template =  "system:/groovy/webui/form/UIFormWithTitle.gtmpl",
+  template =  &#34;system:/groovy/webui/form/UIFormWithTitle.gtmpl&#34;,
   events = {
     @EventConfig(listeners = UIApplicationForm.SaveActionListener.class),
     @EventConfig(phase = Phase.DECODE, listeners = UIApplicationForm.CancelActionListener.class)
@@ -118,13 +114,13 @@
 )
 </programlisting>
 			<para>
-				The path is in the "<literal>system</literal>" namespace. This is a reference to the portal webapp.
+				The path is in the &#34;<literal>system</literal>&#34; namespace. This is a reference to the portal webapp.
 			</para>
 			<para>
 				This webapp contains reusable groovy templates in the folder; <emphasis role="bold">src:/web/portal/src/main/webapp/groovy/webui/form/ </emphasis>.
 			</para>
 			<para>
-				Use the following steps to create a new template; 
+				Use the following steps to create a new template;
 			</para>
 			<procedure>
 				<step>
@@ -134,24 +130,26 @@
 				</step>
 				<step>
 					<para>
-						Use the namespace "app" for refering to the same webapp as the component.
+						Use the namespace &#34;app&#34; for refering to the same webapp as the component.
 					</para>
 				</step>
 				<step>
 					<para>
-						&PRODUCT; stores the component templates in a folder that follows this placement convention: "<filename>/webapp/groovy/<literal>your_portlet_name</literal>/webui/component</filename>".
+						&PRODUCT; stores the component templates in a folder that follows this placement convention: &#34;<filename>/webapp/groovy/<literal>your_portlet_name</literal>/webui/component</filename>&#34;.
 					</para>
 					<para>
-<programlisting>template = "app:/groovy/your_portlet_name/webui/component/your_component.gtmpl"
+						
+<programlisting>template = &#34;app:/groovy/your_portlet_name/webui/component/your_component.gtmpl&#34;
 </programlisting>
 					</para>
 				</step>
 				<step>
 					<para>
-						Edit the template file according to the information in the <xref linkend="sect-Reference_Guide-Linking_a_portlet_with_a_template-The_template_file"/>.
+						Edit the template file according to the information in the <xref linkend="sect-Reference_Guide-Linking_a_portlet_with_a_template-The_template_file" />.
 					</para>
 				</step>
 			</procedure>
+
 		</section>
 		
 		<section id="sect-Reference_Guide-Linking_a_portlet_with_a_template-The_template_file">
@@ -174,15 +172,16 @@
 						Using the <literal>uicomponent</literal> variable, you can access all the attributes and functions of a component to use them in your template.
 					</para>
 					<para>
-						 Take, for example <literal>UIPageIterator.gtmpl</literal>:
-					</para>			
-<programlisting>&lt;%
+						Take, for example <literal>UIPageIterator.gtmpl</literal>:
+					</para>
+					
+<programlisting>&#60;%
   def currentPage = uicomponent.getCurrentPage();
-%&gt;
+%&#62;
 ...
-&lt;a href="&lt;%=uicomponent.event("ShowPage","$currentPage")%&gt;" class="Icon LastTopPageIcon"&gt;
-  &lt;span&gt;&lt;/span&gt;
-&lt;/a&gt;
+&#60;a href=&#34;&#60;%=uicomponent.event(&#34;ShowPage&#34;,&#34;$currentPage&#34;)%&#62;&#34; class=&#34;Icon LastTopPageIcon&#34;&#62;
+  &#60;span&#62;&#60;/span&#62;
+&#60;/a&#62;
 </programlisting>
 					<para>
 						The following example shows how <literal>uicomponent</literal> can be used to make Ajax calls using the <literal>event</literal> method. See <xref linkend="sect-Reference_Guide-AJAX_Framework" /> for more details.
@@ -198,22 +197,23 @@
 					<para>
 						Some usage examples are:
 					</para>
-<programlisting>&lt;%
+					
+<programlisting>&#60;%
   def rcontext = ctx.getRequestContext() ;
-  context.getJavascriptManager().importJavascript('GateIn.webui.UIPopupWindow');
-  ctx.appRes(popupId + ".title."+ title);
-%&gt;
+  context.getJavascriptManager().importJavascript(&#39;GateIn.webui.UIPopupWindow&#39;);
+  ctx.appRes(popupId + &#34;.title.&#34;+ title);
+%&#62;
 </programlisting>
 				</listitem>
 				<listitem>
 					<para>
-						If the template defines the user interface of a component that includes a form use an instance of <literal>UIForm</literal> in a variable named <literal>uiform</literal>. 
+						If the template defines the user interface of a component that includes a form use an instance of <literal>UIForm</literal> in a variable named <literal>uiform</literal>.
 					</para>
 					<para>
-						The <literal>UIForm</literal> class provides the methods <literal>begin()</literal> and <literal>end()</literal> which write the HTML tags of the form. 
+						The <literal>UIForm</literal> class provides the methods <literal>begin()</literal> and <literal>end()</literal> which write the HTML tags of the form.
 					</para>
 					<para>
-						The form class must inherit from <literal>UIForm</literal>. In this class add the input elements (fields, checkboxes, lists) which are required in the form. 
+						The form class must inherit from <literal>UIForm</literal>. In this class add the input elements (fields, checkboxes, lists) which are required in the form.
 					</para>
 					<para>
 						Render the input elements in the groovy template using <literal>uiform.renderField(field)</literal>.

Modified: portal/trunk/docs/reference-guide/en/modules/portlets/Portlet_Lifecycle.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/portlets/Portlet_Lifecycle.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/portlets/Portlet_Lifecycle.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,66 +1,63 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Portlet_Lifecycle">
 	<title>Portlet Lifecycle</title>
+	<para>
+		This chapter does not to refer to the Portlet API specification lifecycle but focuses on the &PRODUCT; UI framework.
+	</para>
+	<para>
+		This web framework has been developed specifically for &PRODUCT; and, while it is not necessary to use the native web framework to build portlets, all portlets packaged with &PRODUCT; are developed using this framework.
+	</para>
+	<para>
+		This consistency allows portlets to use several UI components that can be used in different abstracted contexts (such as the portal itself or some portlets).
+	</para>
+	<note>
+		<title>Recommended Reading</title>
 		<para>
-			This chapter does not to refer to the Portlet API specification lifecycle but focuses on the &PRODUCT; UI framework.
+			This chapter is intended for advanced developers. It covers code implementation and logic. It is not a tutorial on how to write portlets.
 		</para>
 		<para>
-			This web framework has been developed specifically for &PRODUCT; and, while it is not necessary to use the native web framework to build portlets, all portlets packaged with &PRODUCT; are developed using this framework.
+			Refer to <xref linkend="sect-Reference_Guide-Portal_Lifecycle" /> for information on concepts that are similar and top hierarchy classes that are shared.
 		</para>
-		<para>	
-			This consistency allows portlets to use several UI components that can be used in different abstracted contexts (such as the portal itself or some portlets).
-		</para>
-		<note>
-			<title>Recommended Reading</title>
-			<para>
-				This chapter is intended for advanced developers. It covers code implementation and logic. It is not a tutorial on how to write portlets.
-			</para>
-			<para>
-				Refer to <xref linkend="sect-Reference_Guide-Portal_Lifecycle" /> for information on concepts that are similar and top hierarchy classes that are shared.
-			</para>
-		</note>
-
+	</note>
 	<section id="sect-Reference_Guide-Portlet_Lifecycle-Portlet_init">
 		<title>Portlet init</title>
 		<para>
-			The main entry point for configuring a portlet is in the <emphasis role="bold">portlet.xml</emphasis> file located in the portlet application WAR. 
+			The main entry point for configuring a portlet is in the <emphasis role="bold">portlet.xml</emphasis> file located in the portlet application WAR.
 		</para>
 		<para>
-			Each portlet built using the &PRODUCT; web framework must reference the <emphasis role="bold">PortletApplicationController</emphasis> . 
+			Each portlet built using the &PRODUCT; web framework must reference the <emphasis role="bold">PortletApplicationController</emphasis> .
 		</para>
 		<para>
-			The portlet configuration (such as the root component) is defined in <filename>configuration.xml</filename>. The path to this file is defined in the init-param "<emphasis role="bold">webui.configuration</emphasis>" of <filename>portlet.xml</filename>.
+			The portlet configuration (such as the root component) is defined in <filename>configuration.xml</filename>. The path to this file is defined in the init-param &#34;<emphasis role="bold">webui.configuration</emphasis>&#34; of <filename>portlet.xml</filename>.
 		</para>
 		
-<programlisting>&lt;portlet&gt;
-  &lt;description xml:lang="EN"&gt;Content Portlet&lt;/description&gt;
-  &lt;portlet-name&gt;ContentPortlet&lt;/portlet-name&gt;
-  &lt;display-name xml:lang="EN"&gt;Content Portlet&lt;/display-name&gt;
-  &lt;portlet-class&gt;org.exoplatform.webui.application.portlet.PortletApplicationController&lt;/portlet-class&gt;    
+<programlisting>&#60;portlet&#62;
+  &#60;description xml:lang=&#34;EN&#34;&#62;Content Portlet&#60;/description&#62;
+  &#60;portlet-name&#62;ContentPortlet&#60;/portlet-name&#62;
+  &#60;display-name xml:lang=&#34;EN&#34;&#62;Content Portlet&#60;/display-name&#62;
+  &#60;portlet-class&#62;org.exoplatform.webui.application.portlet.PortletApplicationController&#60;/portlet-class&#62;    
     
-  &lt;init-param&gt;
-    &lt;name&gt;webui.configuration&lt;/name&gt;
-    &lt;value&gt;/WEB-INF/conf/portlet/content/ContentPortlet/webui/configuration.xml&lt;/value&gt;
-  &lt;/init-param&gt;
-&lt;/portlet&gt;
+  &#60;init-param&#62;
+    &#60;name&#62;webui.configuration&#60;/name&#62;
+    &#60;value&#62;/WEB-INF/conf/portlet/content/ContentPortlet/webui/configuration.xml&#60;/value&#62;
+  &#60;/init-param&#62;
+&#60;/portlet&#62;
 </programlisting>
 		<para>
-			The structure of the <filename>configuration.xml</filename> file is exactly the same as the <filename>webui-configuration.xml</filename> which was introduced in <xref linkend="sect-Reference_Guide-Portal_Lifecycle" />. 
+			The structure of the <filename>configuration.xml</filename> file is exactly the same as the <filename>webui-configuration.xml</filename> which was introduced in <xref linkend="sect-Reference_Guide-Portal_Lifecycle" />.
 		</para>
 		<para>
 			In the case of the content portlet it is formatted as:
 		</para>
 		
-<programlisting>&lt;webui-configuration&gt;
-  &lt;application&gt; 
-    &lt;ui-component-root&gt;org.exoplatform.content.webui.component.UIContentPortlet&lt;/ui-component-root&gt;
-    &lt;state-manager&gt;org.exoplatform.webui.application.portlet.ParentAppStateManager&lt;/state-manager&gt;
-  &lt;/application&gt;
-&lt;/webui-configuration&gt;
+<programlisting>&#60;webui-configuration&#62;
+  &#60;application&#62; 
+    &#60;ui-component-root&#62;org.exoplatform.content.webui.component.UIContentPortlet&#60;/ui-component-root&#62;
+    &#60;state-manager&#62;org.exoplatform.webui.application.portlet.ParentAppStateManager&#60;/state-manager&#62;
+  &#60;/application&#62;
+&#60;/webui-configuration&#62;
 </programlisting>
 		<para>
 			The <literal>PortletApplicationController</literal> class extends the <literal>GenericPortlet</literal> class defined in the Portlet API specification.
@@ -133,7 +130,7 @@
     UIApplication uiApp = getStateManager().restoreUIRootComponent(context) ;
     context.setUIApplication(uiApp) ;
     processDecode(uiApp, context) ;
-    if(!images/context.isResponseComplete() &amp;&amp;!images/ context.getProcessRender()) {
+    if(!images/context.isResponseComplete() &#38;&#38;!images/ context.getProcessRender()) {
       processAction(uiApp, context) ;
     }
   } finally {
@@ -158,13 +155,13 @@
  */
 private PortletRequestContext createRequestContext(PortletRequest req, PortletResponse res,
                                                   WebuiRequestContext parentAppRequestContext) throws IOException {
-  String attributeName = getApplicationId() + "$PortletRequest" ;
+  String attributeName = getApplicationId() + &#34;$PortletRequest&#34; ;
   PortletRequestContext context = 
     (PortletRequestContext) parentAppRequestContext.getAttribute(attributeName) ;
   Writer w  = null ;       
   if(res instanceof  RenderResponse){
     RenderResponse renderRes = (RenderResponse)res;
-    renderRes.setContentType("text/html; charset=UTF-8");      
+    renderRes.setContentType(&#34;text/html; charset=UTF-8&#34;);      
     w = renderRes.getWriter() ; 
   }
   if(context!images/= null) {
@@ -180,10 +177,11 @@
 		<para>
 			In the <literal>PortletApplication</literal>, the line;
 		</para>
+		
 <programlisting>UIApplication uiApp = getStateManager().restoreUIRootComponent(context);
 </programlisting>
 		<para>
-			 asks the <literal>StateManager</literal> defined for the portlet to get the UI root component. In the case of a portlet the root component must extend <literal>UIPortletApplication</literal>.
+			asks the <literal>StateManager</literal> defined for the portlet to get the UI root component. In the case of a portlet the root component must extend <literal>UIPortletApplication</literal>.
 		</para>
 		
 <programlisting>public class ParentAppStateManager extends StateManager {
@@ -191,7 +189,7 @@
   /**
    * This method simply delegate the call to the same method of the parent WebuiRequestContext
    */
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings(&#34;unchecked&#34;)
   public UIApplication restoreUIRootComponent(WebuiRequestContext context) throws Exception {
     WebuiRequestContext pcontext = (WebuiRequestContext)  context.getParentAppRequestContext() ;
     return pcontext.getStateManager().restoreUIRootComponent(context) ;
@@ -274,7 +272,7 @@
         lifecycle.onEndRequest(this, context) ;
       }
     } catch (Exception exception){
-  	log.error("Error while trying to call onEndRequest of the portlet ApplicationLifecycle", 
+  	log.error(&#34;Error while trying to call onEndRequest of the portlet ApplicationLifecycle&#34;, 
   		exception);
     }
     WebuiRequestContext.setCurrentInstance(parentAppRequestContext) ;
@@ -302,10 +300,10 @@
  */
 public void  processRender(WebuiApplication app, WebuiRequestContext context) throws Exception {
   WebuiRequestContext pContext = (WebuiRequestContext)context.getParentAppRequestContext();
-  if(context.useAjax() &amp;&amp;!images/pContext.getFullRender()) {
+  if(context.useAjax() &#38;&#38;!images/pContext.getFullRender()) {
     Writer w =  context.getWriter() ;
     
-    Set&lt;UIComponent&gt; list = context.getUIComponentToUpdateByAjax() ;
+    Set&#60;UIComponent&#62; list = context.getUIComponentToUpdateByAjax() ;
     if(list!images/= null) {
       if(getUIPopupMessages().hasMessage()) context.addUIComponentToUpdateByAjax(getUIPopupMessages()) ;
       for(UIComponent uicomponent : list) {

Modified: portal/trunk/docs/reference-guide/en/modules/portlets/Standard.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/portlets/Standard.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/portlets/Standard.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,14 +1,12 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Portlet_Primer">
 	<title>Portlet Primer</title>
 	<section id="sect-Reference_Guide-Portlet_Primer-JSR_168_and_JSR_286_overview">
 		<title>JSR-168 and JSR-286 overview</title>
 		<para>
-			The Java Community Process (<literal>JCP</literal>) uses Java Specification Requests (<literal>JSR</literal>s) to define proposed specifications and technologies designed for the Java platform. 
+			The Java Community Process (<literal>JCP</literal>) uses Java Specification Requests (<literal>JSR</literal>s) to define proposed specifications and technologies designed for the Java platform.
 		</para>
 		<para>
 			The Portlet Specifications aim at defining portlets that can be used by any <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 (Portlet 1.0)</ulink> or <ulink url="http://www.jcp.org/en/jsr/detail?id=286">JSR-286 (Portlet 2.0)</ulink> portlet container.
@@ -45,31 +43,31 @@
 				A portlet can have different view modes. Three modes are defined by the JSR-286 specification:
 			</para>
 			<variablelist>
-			  <varlistentry>
-				<term>View</term>
-				<listitem>
-					<para>
-						Generates markup reflecting the current state of the portlet.
-					</para>
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term>Edit</term>
-				<listitem>
-					<para>
-						Allows a user to customize the behavior of the portlet.
-					</para>
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term>Help</term>
-				<listitem>
-					<para>
-						Provides information to the user as to how to use the portlet.
-					</para>
-				</listitem>
-			</varlistentry>
-			</variablelist>				
+				<varlistentry>
+					<term>View</term>
+					<listitem>
+						<para>
+							Generates markup reflecting the current state of the portlet.
+						</para>
+					</listitem>
+				</varlistentry>
+				<varlistentry>
+					<term>Edit</term>
+					<listitem>
+						<para>
+							Allows a user to customize the behavior of the portlet.
+						</para>
+					</listitem>
+				</varlistentry>
+				<varlistentry>
+					<term>Help</term>
+					<listitem>
+						<para>
+							Provides information to the user as to how to use the portlet.
+						</para>
+					</listitem>
+				</varlistentry>
+			</variablelist>
 		</section>
 		
 		<section id="sect-Reference_Guide-JSR_168_and_JSR_286_overview-Window_States">
@@ -78,30 +76,30 @@
 				Window states are an indicator of how much page space a portlet consumes on any given page. The three states defined by the JSR-168 specification are:
 			</para>
 			<variablelist>
-			  <varlistentry>
-				<term>Normal</term>
-				<listitem>
-					<para>
-						A portlet shares this page with other portlets.
-					</para>
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term>Minimized</term>
-				<listitem>
-					<para>
-						A portlet may show very little information, or none at all.
-					</para>
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term>Maximized</term>
-				<listitem>
-					<para>
-						A portlet may be the only portlet displayed on this page.
-					</para>
-				</listitem>
-			</varlistentry>
+				<varlistentry>
+					<term>Normal</term>
+					<listitem>
+						<para>
+							A portlet shares this page with other portlets.
+						</para>
+					</listitem>
+				</varlistentry>
+				<varlistentry>
+					<term>Minimized</term>
+					<listitem>
+						<para>
+							A portlet may show very little information, or none at all.
+						</para>
+					</listitem>
+				</varlistentry>
+				<varlistentry>
+					<term>Maximized</term>
+					<listitem>
+						<para>
+							A portlet may be the only portlet displayed on this page.
+						</para>
+					</listitem>
+				</varlistentry>
 			</variablelist>
 		</section>
 
@@ -114,18 +112,15 @@
 		</para>
 		<note>
 			<title>Maven</title>
-				<para>
-					This example is using Maven to compile and build the web archive. Maven versions can be downloaded from <ulink url="http://maven.apache.org/download.html">maven.apache.org</ulink>
-				</para>
+			<para>
+				This example is using Maven to compile and build the web archive. Maven versions can be downloaded from <ulink url="http://maven.apache.org/download.html">maven.apache.org</ulink>
+			</para>
 		</note>
-
 		<section id="sect-Reference_Guide-Tutorials-Deploying_your_first_Portlet">
 			<title>Deploying your first Portlet</title>
-
-				<para>
-					This section describes how to deploy a portlet in &PRODUCT;. A sample portlet called <filename>SimplestHelloWorld</filename> is located in the <literal>examples</literal> directory at the root of your &PRODUCT; binary package. This sample is used in the following examples.
-				</para>
-		
+			<para>
+				This section describes how to deploy a portlet in &PRODUCT;. A sample portlet called <filename>SimplestHelloWorld</filename> is located in the <literal>examples</literal> directory at the root of your &PRODUCT; binary package. This sample is used in the following examples.
+			</para>
 			<section id="sect-Reference_Guide-Deploying_your_first_Portlet-Compiling">
 				<title>Compiling</title>
 				<para>
@@ -134,19 +129,20 @@
 				<procedure>
 					<step>
 						<para>
-							 Navigate to the <filename>SimplestHelloWorld</filename> directory and execute:
+							Navigate to the <filename>SimplestHelloWorld</filename> directory and execute:
 						</para>
+						
 <programlisting>mvn package
 </programlisting>
 					</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>
 						<para>
-							Copy the package file into <literal>JBOSS_HOME/server/default/deploy</literal>. 
+							Copy the package file into <literal>JBOSS_HOME/server/default/deploy</literal>.
 						</para>
 					</step>
 					<step>
@@ -166,21 +162,22 @@
 						</mediaobject>
 					</step>
 				</procedure>
+
 			</section>
 			
 			<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. 
-				</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.
+				</para>
 				<para>
 					The following is an example of the directory structure of the <filename>SimplestHelloWorld</filename> portlet:
 				</para>
 				<programlistingco>
 					<areaspec>
-						<area coords="9" id="area-Reference_Guide-tutorials.simplest.javaclass" />
-						<area coords="10" id="area-Reference_Guide-tutorials.simplest.portlet" />
-						<area coords="11" id="area-Reference_Guide-tutorials.simplest.web" />
+						<area coords="9" id="area-Reference_Guide-Deploying_your_first_Portlet-Package_Structure.javaclass" />
+						<area coords="10" id="area-Reference_Guide-Deploying_your_first_Portlet-Package_Structure.portlet" />
+						<area coords="11" id="area-Reference_Guide-Deploying_your_first_Portlet-Package_Structure.web" />
 					</areaspec>
 					
 <programlisting>|-- SimplestHelloWorld-0.0.1.war
@@ -196,17 +193,17 @@
 |       `-- web.xml
 </programlisting>
 					<calloutlist>
-						<callout arearefs="area-Reference_Guide-tutorials.simplest.javaclass">
+						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Package_Structure.javaclass">
 							<para>
 								The compiled Java class implementing <emphasis>javax.portlet.Portlet</emphasis> (through <emphasis>javax.portlet.GenericPortlet </emphasis> )
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.simplest.portlet">
+						<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..
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.simplest.web">
+						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Package_Structure.web">
 							<para>
 								This is the mandatory descriptor for web applications.
 							</para>
@@ -223,11 +220,11 @@
 				</para>
 				<programlistingco>
 					<areaspec>
-						<area coords="10" id="area-Reference_Guide-tutorials.simplest.extends" />
-						<area coords="13" id="area-Reference_Guide-tutorials.simplest.doview" />
-						<area coords="15" id="area-Reference_Guide-tutorials.simplest.writer" />
-						<area coords="16" id="area-Reference_Guide-tutorials.simplest.write" />
-						<area coords="17" id="area-Reference_Guide-tutorials.simplest.close" />
+						<area coords="10" id="area-Reference_Guide-Deploying_your_first_Portlet-Portlet_Class.extends" />
+						<area coords="13" id="area-Reference_Guide-Deploying_your_first_Portlet-Portlet_Class.doview" />
+						<area coords="15" id="area-Reference_Guide-Deploying_your_first_Portlet-Portlet_Class.writer" />
+						<area coords="16" id="area-Reference_Guide-Deploying_your_first_Portlet-Portlet_Class.write" />
+						<area coords="17" id="area-Reference_Guide-Deploying_your_first_Portlet-Portlet_Class.close" />
 					</areaspec>
 					
 <programlisting role="JAVA">package org.gatein.portal.examples.portlets;
@@ -245,39 +242,39 @@
                        RenderResponse response) throws IOException
    {
       PrintWriter writer = response.getWriter();
-      writer.write("Hello World !");
+      writer.write(&#34;Hello World !&#34;);
       writer.close();
    }
 }
 </programlisting>
 					<calloutlist>
-						<callout arearefs="area-Reference_Guide-tutorials.simplest.extends">
+						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Portlet_Class.extends">
 							<para>
-								All portlets must implement the <literal>javax.portlet.Portlet</literal> interface. The portlet API provides a convenient implementation of this interface. 
+								All portlets must implement the <literal>javax.portlet.Portlet</literal> interface. The portlet API provides a convenient implementation of this interface.
 							</para>
 							<para>
-								The <literal>javax.portlet.Portlet</literal> interface uses the <literal>javax.portlet.GenericPortlet</literal> class which implements the <literal>Portlet render</literal> method to dispatch to abstract mode-specific methods. This makes it easier to support the standard portlet modes. 
+								The <literal>javax.portlet.Portlet</literal> interface uses the <literal>javax.portlet.GenericPortlet</literal> class which implements the <literal>Portlet render</literal> method to dispatch to abstract mode-specific methods. This makes it easier to support the standard portlet modes.
 							</para>
 							<para>
 								<literal>Portlet render</literal> also provides a default implementation for the <literal>processAction</literal>, <literal>init</literal> and <literal>destroy</literal> methods. It is recommended to extend <literal>GenericPortlet</literal> for most cases.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.simplest.doview">
+						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Portlet_Class.doview">
 							<para>
 								If only the <literal>view</literal> mode is required, then only the <literal>doView</literal> method needs to be implemented. The <literal>GenericPortlet</literal><literal>render</literal> implementation calls our implementation when the <literal>view</literal> mode is requested.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.simplest.writer">
+						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Portlet_Class.writer">
 							<para>
 								Use the <emphasis>RenderResponse</emphasis> to obtain a writer to be used to produce content.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.simplest.write">
+						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Portlet_Class.write">
 							<para>
 								Write the markup to display.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.simplest.close">
+						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Portlet_Class.close">
 							<para>
 								Closing the writer.
 							</para>
@@ -289,7 +286,7 @@
 					<note>
 						<title>Markup Fragments</title>
 						<para>
-							Portlets are responsible for generating markup fragments, as they are included on a page and are surrounded by other portlets. This means that a portlet outputting HTML must not output any markup that cannot be found in a <literal>&lt;body&gt;</literal> element.
+							Portlets are responsible for generating markup fragments, as they are included on a page and are surrounded by other portlets. This means that a portlet outputting HTML must not output any markup that cannot be found in a <literal>&#60;body&#62;</literal> element.
 						</para>
 					</note>
 				</para>
@@ -305,60 +302,60 @@
 				</para>
 				<programlistingco>
 					<areaspec>
-						<area coords="8" id="area-Reference_Guide-tutorials.simplest.portletname" />
-						<area coords="9" id="area-Reference_Guide-tutorials.simplest.portletclass" />
-						<area coords="12" id="area-Reference_Guide-tutorials.simplest.supports" />
-						<area coords="15" id="area-Reference_Guide-tutorials.simplest.portletinfo" />
+						<area coords="8" id="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.portletname" />
+						<area coords="9" id="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.portletclass" />
+						<area coords="12" id="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.supports" />
+						<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"
-   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;
+&#60;portlet-app xmlns=&#34;http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd&#34;
+   xmlns:xsi=&#34;http://www.w3.org/2001/XMLSchema-instance&#34;
+   xsi:schemaLocation=&#34;http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd 
+                                         http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd&#34;
+   version=&#34;2.0&#34;&#62;
+   &#60;portlet&#62;
+      &#60;portlet-name&#62;SimplestHelloWorldPortlet&#60;/portlet-name&#62;
+      &#60;portlet-class&#62;
          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;
+      &#60;/portlet-class&#62;
+      &#60;supports&#62;
+        &#60;mime-type&#62;text/html&#60;/mime-type&#62;
+      &#60;/supports&#62;
+      &#60;portlet-info&#62;
+          &#60;title&#62;Simplest Hello World Portlet&#60;/title&#62;
+      &#60;/portlet-info&#62;
+   &#60;/portlet&#62;
+&#60;/portlet-app&#62;
 </programlisting>
 					<calloutlist>
-						<callout arearefs="area-Reference_Guide-tutorials.simplest.portletname">
+						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.portletname">
 							<para>
 								Define the portlet name. It does not have to be the class name.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.simplest.portletclass">
+						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.portletclass">
 							<para>
 								The Fully Qualified Name (<literal>FQN</literal>) of your portlet class must be declared here.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.simplest.supports">
+						<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>&#60;supports&#62; </literal> element declares all of the markup types that a portlet supports in the <literal>render</literal> method. This is accomplished via the <literal>&#60;mime-type&#62; </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.
 							</para>
 							<para>
-								This does not have to be declared as all portlets must support the <literal>view</literal> portlet mode. 
+								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>&#60;mime-type&#62; </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.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.simplest.portletinfo">
+						<callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.portletinfo">
 							<para>
-								When rendered, the portlet's title is displayed as the header in the portlet window, unless it is overridden programmatically. In the example above the title would be <literal>Simplest Hello World Portlet</literal> .
+								When rendered, the portlet&#39;s title is displayed as the header in the portlet window, unless it is overridden programmatically. In the example above the title would be <literal>Simplest Hello World Portlet</literal> .
 							</para>
 						</callout>
 					</calloutlist>
@@ -368,67 +365,67 @@
 
 		</section>
 		
-		<section id="sect-Reference_Guide-Tutorials-_JavaServer_Pages_Portlet_Example_">
+		<section id="sect-Reference_Guide-Tutorials-JavaServer_Pages_Portlet_Example">
 			<title>JavaServer Pages Portlet Example</title>
+			<para>
+				This section discusses:
+			</para>
+			<orderedlist>
+				<listitem>
+					<para>
+						Adding more features to the previous example.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						Using a JSP page to render the markup.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						Using the portlet tag library to generate links to the portlet in different ways.
+					</para>
+				</listitem>
+				<listitem>
+					<para>
+						Using the other standard portlet modes.
+					</para>
+				</listitem>
+			</orderedlist>
+			<procedure>
+				<step>
+					<para>
+						The example used in this section can be found in the <literal>JSPHelloUser</literal> directory.
+					</para>
+				</step>
+				<step>
+					<para>
+						Execute <command>mvn package</command> in this directory.
+					</para>
+				</step>
+				<step>
+					<para>
+						Copy <filename>JSPHelloUser/target/JSPHelloUser-0.0.1.war </filename> to the <literal>deploy</literal> directory of JBoss Application Server.
+					</para>
+				</step>
+				<step>
+					<para>
+						Select the new <literal>JSPHelloUser</literal> tab in your portal.
+					</para>
+				</step>
+			</procedure>
+			
+			<mediaobject>
+				<imageobject>
+					<imagedata align="center" fileref="images/tutorials/jsp_portlet/output.png" format="PNG" scalefit="1" width="444" />
+				</imageobject>
+			</mediaobject>
+			<note>
 				<para>
-					This section discusses:
+					The <literal>EDIT</literal> button only appears with logged-in users, which is not the case in the screenshot.
 				</para>
-				<orderedlist>
-					<listitem>
-						<para>
-							Adding more features to the previous example.
-						</para>
-					</listitem>
-					<listitem>
-						<para>
-							Using a JSP page to render the markup.
-						</para>
-					</listitem>
-					<listitem>
-						<para>
-							Using the portlet tag library to generate links to the portlet in different ways.
-						</para>
-					</listitem>
-					<listitem>
-						<para>
-							 Using the other standard portlet modes.
-						</para>
-					</listitem>
-				</orderedlist>
-				<procedure>
-					<step>
-						<para>
-							The example used in this section can be found in the <literal>JSPHelloUser</literal> directory.
-						</para>
-					</step>
-					<step>
-						<para>
-							Execute <command>mvn package</command> in this directory.
-						</para>
-					</step>
-					<step>
-						<para>
-							Copy <filename>JSPHelloUser/target/JSPHelloUser-0.0.1.war </filename> to the <literal>deploy</literal> directory of JBoss Application Server.
-						</para>
-					</step>
-					<step>
-						<para>
-							Select the new <literal>JSPHelloUser</literal> tab in your portal.
-						</para>
-					</step>
-				</procedure>
-					<mediaobject>
-						<imageobject>
-							<imagedata align="center" fileref="images/tutorials/jsp_portlet/output.png" format="PNG" scalefit="1" width="444" />
-						</imageobject>
-					</mediaobject>
-					<note>
-						<para>
-							The <literal>EDIT</literal> button only appears with logged-in users, which is not the case in the screenshot.
-						</para>
-					</note>
-			
-			<section id="sect-Reference_Guide-_JavaServer_Pages_Portlet_Example_-Package_Structure">
+			</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.
@@ -458,17 +455,17 @@
 </programlisting>
 			</section>
 			
-			<section id="sect-Reference_Guide-_JavaServer_Pages_Portlet_Example_-Portlet_Class">
+			<section id="sect-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class">
 				<title>Portlet Class</title>
 				<para>
 					The code below is from the <filename> JSPHelloUser/src/main/java/org/gatein/portal/examples/portlets/JSPHelloUserPortlet.java </filename> Java source. It is split in different pieces.
 				</para>
 				<programlistingco>
 					<areaspec>
-						<area coords="18" id="area-Reference_Guide-tutorials.jsphello.doView" />
-						<area coords="21" id="area-Reference_Guide-tutorials.jsphello.renderParameter" />
-						<area coords="25" id="area-Reference_Guide-tutorials.jsphello.requestDispatcher" />
-						<area coords="26" id="area-Reference_Guide-tutorials.jsphello.include" />
+						<area coords="18" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.doView" />
+						<area coords="21" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.renderParameter" />
+						<area coords="25" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.requestDispatcher" />
+						<area coords="26" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.include" />
 					</areaspec>
 					
 <programlisting role="JAVA">package org.gatein.portal.examples.portlets;
@@ -490,39 +487,39 @@
    public void doView(RenderRequest request, RenderResponse response)
        throws PortletException, IOException
    {
-      String sYourName = (String) request.getParameter("yourname");
+      String sYourName = (String) request.getParameter(&#34;yourname&#34;);
       if (sYourName != null)
       {
-         request.setAttribute("yourname", sYourName);
+         request.setAttribute(&#34;yourname&#34;, sYourName);
          PortletRequestDispatcher prd = 
-            getPortletContext().getRequestDispatcher("/jsp/hello.jsp");
+            getPortletContext().getRequestDispatcher(&#34;/jsp/hello.jsp&#34;);
          prd.include(request, response);
       }
       else
       {
-         PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher("/jsp/welcome.jsp");
+         PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(&#34;/jsp/welcome.jsp&#34;);
          prd.include(request, response);
       }
    }
 ...
 </programlisting>
 					<calloutlist>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.doView">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.doView">
 							<para>
 								Override the <emphasis>doView</emphasis> method (as in the first tutorial).
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.renderParameter">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.renderParameter">
 							<para>
 								This entry attempts to obtain the value of the render parameter named <literal>yourname</literal>. If defined it should redirect to the <filename>hello.jsp</filename> JSP page, otherwise to the <filename>welcome.jsp</filename> JSP page.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.requestDispatcher">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.requestDispatcher">
 							<para>
 								Get a request dispatcher on a file located within the web archive.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.include">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.include">
 							<para>
 								Perform the inclusion of the markup obtained from the JSP.
 							</para>
@@ -534,7 +531,7 @@
 					As well as the <literal>VIEW</literal> portlet mode, the specification defines two other modes; <literal>EDIT</literal> and <literal>HELP</literal>.
 				</para>
 				<para>
-					These modes need to be defined in the <filename>portlet.xml</filename> descriptor. This will enable the corresponding buttons on the portlet's window.
+					These modes need to be defined in the <filename>portlet.xml</filename> descriptor. This will enable the corresponding buttons on the portlet&#39;s window.
 				</para>
 				<para>
 					The generic portlet that is inherited dispatches the different views to the methods: <literal>doView</literal> , <literal>doHelp</literal> and <literal>doEdit</literal>.
@@ -544,16 +541,16 @@
    protected void doHelp(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException,
          UnavailableException
    {
-      rResponse.setContentType("text/html");
-      PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher("/jsp/help.jsp");
+      rResponse.setContentType(&#34;text/html&#34;);
+      PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(&#34;/jsp/help.jsp&#34;);
       prd.include(rRequest, rResponse);
    }
 
    protected void doEdit(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException,
          UnavailableException
    {
-      rResponse.setContentType("text/html");
-      PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher("/jsp/edit.jsp");
+      rResponse.setContentType(&#34;text/html&#34;);
+      PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(&#34;/jsp/edit.jsp&#34;);
       prd.include(rRequest, rResponse);
    }
 ...
@@ -569,32 +566,32 @@
 				</para>
 				<programlistingco>
 					<areaspec>
-						<area coords="2" id="area-Reference_Guide-tutorials.jsphello.processAction" />
-						<area coords="5" id="area-Reference_Guide-tutorials.jsphello.getActionParameter" />
-						<area coords="6" id="area-Reference_Guide-tutorials.jsphello.setRenderParameter" />
+						<area coords="2" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.processAction" />
+						<area coords="5" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.getActionParameter" />
+						<area coords="6" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.setRenderParameter" />
 					</areaspec>
 					
 <programlisting role="JAVA">...
          public void processAction(ActionRequest aRequest, ActionResponse aResponse) throws PortletException, IOException,
          UnavailableException
    {
-      String sYourname = (String) aRequest.getParameter("yourname");
-      aResponse.setRenderParameter("yourname", sYourname);
+      String sYourname = (String) aRequest.getParameter(&#34;yourname&#34;);
+      aResponse.setRenderParameter(&#34;yourname&#34;, sYourname);
    }
 ...
 </programlisting>
 					<calloutlist>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.processAction">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.processAction">
 							<para>
 								<literal>processAction</literal> is the method from <literal>GernericPorlet</literal> to override for the <emphasis>action</emphasis> phase.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.getActionParameter">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.getActionParameter">
 							<para>
 								Here the parameter is retrieved through an <emphasis>action URL</emphasis> .
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.setRenderParameter">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.setRenderParameter">
 							<para>
 								The value of <literal>yourname</literal> is kept to make it available in the rendering phase. The previous line simply copies an action parameters to a render parameter for this example.
 							</para>
@@ -604,96 +601,96 @@
 
 			</section>
 			
-			<section id="sect-Reference_Guide-_JavaServer_Pages_Portlet_Example_-_JSP_files_and_the_Portlet_Tag_Library_">
+			<section id="sect-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library">
 				<title>JSP files and the Portlet Tag Library</title>
 				<para>
 					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 role="XHTML">&#60;div class=&#34;portlet-section-header&#34;&#62;Help mode&#60;/div&#62;
+&#60;div class=&#34;portlet-section-body&#34;&#62;This is the help mode, a convenient place to give the user some help information.&#60;/div&#62;
 </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 role="XHTML">&#60;div class=&#34;portlet-section-header&#34;&#62;Edit mode&#60;/div&#62;
+&#60;div class=&#34;portlet-section-body&#34;&#62;This is the edit mode, a convenient place to let the user change his portlet preferences.&#60;/div&#62;
 </programlisting>
 				<para>
 					The landing page contains the links and form to call our portlet:
 				</para>
 				<programlistingco>
 					<areaspec>
-						<area coords="1" id="area-Reference_Guide-tutorials.jsphello.taglib" />
-						<area coords="13" id="area-Reference_Guide-tutorials.jsphello.method1" />
-						<area coords="20" id="area-Reference_Guide-tutorials.jsphello.method2.1" />
-						<area coords="24" id="area-Reference_Guide-tutorials.jsphello.method2.2" />
-						<area coords="30" id="area-Reference_Guide-tutorials.jsphello.method3.1" />
-						<area coords="31" id="area-Reference_Guide-tutorials.jsphello.method3.2" />
+						<area coords="1" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.taglib" />
+						<area coords="13" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.method1" />
+						<area coords="20" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.method2.1" />
+						<area coords="24" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.method2.2" />
+						<area coords="30" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.method3.1" />
+						<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>&#60;%@ taglib uri=&#34;http://java.sun.com/portlet&#34; prefix=&#34;portlet&#34; %&#62;
 
-&lt;div class="portlet-section-header"&gt;Welcome !&lt;/div&gt;
+&#60;div class=&#34;portlet-section-header&#34;&#62;Welcome !&#60;/div&#62;
 
-&lt;br/&gt;
+&#60;br/&#62;
 
-&lt;div class="portlet-font"&gt;Welcome on the JSP Hello User portlet,
-my name is GateIn Portal. What's yours ?&lt;/div&gt;
+&#60;div class=&#34;portlet-font&#34;&#62;Welcome on the JSP Hello User portlet,
+my name is GateIn Portal. What&#39;s yours ?&#60;/div&#62;
 
-&lt;br/&gt;
+&#60;br/&#62;
 
-&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;
+&#60;div class=&#34;portlet-font&#34;&#62;Method 1: We simply pass the parameter to the render phase:&#60;br/&#62;
+&#60;a href=&#34;&#60;portlet:renderURL&#62;&#60;portlet:param name=&#34;yourname&#34; value=&#34;John Doe&#34;/&#62;
+                &#60;/portlet:renderURL&#62;&#34;&#62;John Doe&#60;/a&#62;&#60;/div&#62;
 
-&lt;br/&gt;
+&#60;br/&#62;
 
-&lt;div class="portlet-font"&gt;Method 2: We pass the parameter to the render phase, using valid XML:
+&#60;div class=&#34;portlet-font&#34;&#62;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;
+&#60;portlet:renderURL var=&#34;myRenderURL&#34;&#62;
+    &#60;portlet:param name=&#34;yourname&#34; value=&#39;John Doe&#39;/&#62;
+&#60;/portlet:renderURL&#62;
+&#60;br/&#62;
+&#60;a href=&#34;&#60;%= myRenderURL %&#62;&#34;&#62;John Doe&#60;/a&#62;&#60;/div&#62;
 
-&lt;br/&gt;
+&#60;br/&#62;
 
-&lt;div class="portlet-font"&gt;Method 3: We use a form:&lt;br/&gt;
+&#60;div class=&#34;portlet-font&#34;&#62;Method 3: We use a form:&#60;br/&#62;
 
-&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;
+&#60;portlet:actionURL var=&#34;myActionURL&#34;/&#62;
+&#60;form action=&#34;&#60;%= myActionURL %&#62;&#34; method=&#34;POST&#34;&#62;
+         &#60;span class=&#34;portlet-form-field-label&#34;&#62;Name:&#60;/span&#62;
+         &#60;input class=&#34;portlet-form-input-field&#34; type=&#34;text&#34; name=&#34;yourname&#34;/&#62;
+         &#60;input class=&#34;portlet-form-button&#34; type=&#34;Submit&#34;/&#62;
+&#60;/form&#62;
+&#60;/div&#62;
 </programlisting>
 					<calloutlist>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.taglib">
+						<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.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.method1">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.method1">
 							<para>
-								The first method showed here is the simplest one. <literal>portlet:renderURL</literal> will create a URL that calls the render phase of the current portlet and append the result at the place of the markup (within a tag). A parameter is  also added directly to the URL.
+								The first method showed here is the simplest one. <literal>portlet:renderURL</literal> will create a URL that calls the render phase of the current portlet and append the result at the place of the markup (within a tag). A parameter is also added directly to the URL.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.method2.1">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.method2.1">
 							<para>
 								In this method the <literal>var</literal> attribute is used. This avoids having one XML tag within another. Instead of printing the url the <literal>portlet:renderURL</literal> tag will store the result in the referenced variable ( <literal>myRenderURL</literal>).
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.method2.2">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.method2.2">
 							<para>
 								The variable <literal>myRenderURL</literal> is used like any other JSP variable.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.method3.1">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.method3.1">
 							<para>
 								The third method mixes form submission and action request. Again, a temporary variable is used to put the created URL into.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsphello.method3.2">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSP_files_and_the_Portlet_Tag_Library.method3.2">
 							<para>
 								The action URL is used in HTML form.
 							</para>
@@ -711,10 +708,10 @@
 				</para>
 			</section>
 			
-			<section id="sect-Reference_Guide-_JavaServer_Pages_Portlet_Example_-_JSF_example_using_the_JBoss_Portlet_Bridge_">
+			<section id="sect-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge">
 				<title>JSF example using the JBoss Portlet Bridge </title>
 				<para>
-					In order to write a portlet using JSF a 'bridge' is needed. This software allows developers to write a portlet application as if it was a JSF application. The bridge then negotiates the interactions between the two layers.
+					In order to write a portlet using JSF a &#39;bridge&#39; is needed. This software allows developers to write a portlet application as if it was a JSF application. The bridge then negotiates the interactions between the two layers.
 				</para>
 				<para>
 					An example of the JBoss Portlet Bridge is available in <filename>examples/JSFHelloUser</filename>. The configuration is slightly different from a JSP application. This example can be used as a base to configure instead of creating a new application.
@@ -723,14 +720,14 @@
 					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 role="XML">&#60;faces-config&#62;
 ...
-    &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;
+    &#60;application&#62;
+      &#60;view-handler&#62;org.jboss.portletbridge.application.PortletViewHandler&#60;/view-handler&#62;
+      &#60;state-manager&#62;org.jboss.portletbridge.application.PortletStateManager&#60;/state-manager&#62;
+   &#60;/application&#62;
 ...
-&lt;/faces-config&gt;
+&#60;/faces-config&#62;
 </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.
@@ -740,68 +737,68 @@
 				</para>
 				<programlistingco>
 					<areaspec>
-						<area coords="9" id="area-Reference_Guide-tutorials.jsf.portlet" />
-						<area coords="21" id="area-Reference_Guide-tutorials.jsf.view" />
-						<area coords="26" id="area-Reference_Guide-tutorials.jsf.edit" />
-						<area coords="31" id="area-Reference_Guide-tutorials.jsf.help" />
+						<area coords="9" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.portlet" />
+						<area coords="21" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.view" />
+						<area coords="26" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.edit" />
+						<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"
-   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;
+<programlisting>&#60;?xml version=&#34;1.0&#34; encoding=&#34;UTF-8&#34;?&#62;
+&#60;portlet-app xmlns=&#34;http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd&#34;
+   xmlns:xsi=&#34;http://www.w3.org/2001/XMLSchema-instance&#34;
+   xsi:schemaLocation=&#34;http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd 
+                                         http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd&#34;
+   version=&#34;2.0&#34;&#62;
+   &#60;portlet&#62;
+      &#60;portlet-name&#62;JSFHelloUserPortlet&#60;/portlet-name&#62;
+      &#60;portlet-class&#62;javax.portlet.faces.GenericFacesPortlet&#60;/portlet-class&#62;
+      &#60;supports&#62;
+         &#60;mime-type&#62;text/html&#60;/mime-type&#62;
+         &#60;portlet-mode&#62;view&#60;/portlet-mode&#62;
+         &#60;portlet-mode&#62;edit&#60;/portlet-mode&#62;
+         &#60;portlet-mode&#62;help&#60;/portlet-mode&#62;
+      &#60;/supports&#62;
+      &#60;portlet-info&#62;
+         &#60;title&#62;JSF Hello User Portlet&#60;/title&#62;
+      &#60;/portlet-info&#62;
       
-      &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;
+      &#60;init-param&#62;
+         &#60;name&#62;javax.portlet.faces.defaultViewId.view&#60;/name&#62;
+         &#60;value&#62;/jsf/welcome.jsp&#60;/value&#62;
+      &#60;/init-param&#62;
 
-      &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;
+      &#60;init-param&#62;
+         &#60;name&#62;javax.portlet.faces.defaultViewId.edit&#60;/name&#62;
+         &#60;value&#62;/jsf/edit.jsp&#60;/value&#62;
+      &#60;/init-param&#62;
 
-      &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;
+      &#60;init-param&#62;
+         &#60;name&#62;javax.portlet.faces.defaultViewId.help&#60;/name&#62;
+         &#60;value&#62;/jsf/help.jsp&#60;/value&#62;
+      &#60;/init-param&#62;
 
-   &lt;/portlet&gt;
-&lt;/portlet-app&gt;
+   &#60;/portlet&#62;
+&#60;/portlet-app&#62;
 </programlisting>
 					<calloutlist>
-						<callout arearefs="area-Reference_Guide-tutorials.jsf.portlet">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.portlet">
 							<para>
 								All JSF portlets define <literal>javax.portlet.faces.GenericFacesPortlet </literal> as portlet class. This class is part of the JBoss Portlet Bridge
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsf.view">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.view">
 							<para>
-								This is a mandatory parameter to define what's the default page to display.
+								This is a mandatory parameter to define what&#39;s the default page to display.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsf.edit">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.edit">
 							<para>
-								This parameter defines which page to display on the 'edit' mode.
+								This parameter defines which page to display on the &#39;edit&#39; mode.
 							</para>
 						</callout>
-						<callout arearefs="area-Reference_Guide-tutorials.jsf.help">
+						<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.help">
 							<para>
-								This parameter defines which page to display on the 'help' mode.
+								This parameter defines which page to display on the &#39;help&#39; mode.
 							</para>
 						</callout>
 					</calloutlist>

Modified: portal/trunk/docs/reference-guide/en/modules/portlets/WebUI.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/portlets/WebUI.xml	2010-02-15 01:19:14 UTC (rev 1673)
+++ portal/trunk/docs/reference-guide/en/modules/portlets/WebUI.xml	2010-02-15 01:20:35 UTC (rev 1674)
@@ -1,16 +1,14 @@
 <?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">
-%BOOK_ENTITIES;
 ]>
 <section id="sect-Reference_Guide-Web_User_Interface_WebUI">
 	<title>Web User Interface - WebUI</title>
 	<para>
-		WebUI is the name of &PRODUCT;'s webframework.
-	</para>	
+		WebUI is the name of &PRODUCT;&#39;s webframework.
+	</para>
 	<para>
-		Using a self-contained framework ensures that the portal's architecture does not interfere with other web technologies deployed by the portlets.
-	</para>	
+		Using a self-contained framework ensures that the portal&#39;s architecture does not interfere with other web technologies deployed by the portlets.
+	</para>
 	<para>
 		Using a particular technology raises potential difficulties for users with a differing version (either newer or older) of the same technology.
 	</para>



More information about the gatein-commits mailing list