[gatein-commits] gatein SVN: r7044 - in epp/docs/branches/5.1/User_Guide: en-US and 6 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Aug 11 00:41:47 EDT 2011


Author: smumford
Date: 2011-08-11 00:41:47 -0400 (Thu, 11 Aug 2011)
New Revision: 7044

Added:
   epp/docs/branches/5.1/User_Guide/en-US/modules/Supported_Browsers.xml
   epp/docs/branches/5.1/User_Guide/en-US/modules/terms/Portlet_container_concept.xml
Modified:
   epp/docs/branches/5.1/User_Guide/en-US/Book_Info.xml
   epp/docs/branches/5.1/User_Guide/en-US/Revision_History.xml
   epp/docs/branches/5.1/User_Guide/en-US/User_Guide.xml
   epp/docs/branches/5.1/User_Guide/en-US/modules/Terms.xml
   epp/docs/branches/5.1/User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml
   epp/docs/branches/5.1/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
   epp/docs/branches/5.1/User_Guide/en-US/modules/portal/Manage_Portals.xml
   epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml
   epp/docs/branches/5.1/User_Guide/publican.cfg
Log:
Added Supported Browsers,Portlet Container Concept sections. Prep for 5.1.1 release.

Modified: epp/docs/branches/5.1/User_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.1/User_Guide/en-US/Book_Info.xml	2011-08-11 04:36:00 UTC (rev 7043)
+++ epp/docs/branches/5.1/User_Guide/en-US/Book_Info.xml	2011-08-11 04:41:47 UTC (rev 7044)
@@ -7,7 +7,7 @@
     <productname>JBoss Enterprise Portal Platform</productname>
     <productnumber>5.1</productnumber>
     <edition>2</edition>
-    <pubsnumber>5.1.2</pubsnumber>
+    <pubsnumber>5.1.6</pubsnumber>
     <abstract>
         <para>
 This document provides an easy to follow guide to the functions and

Modified: epp/docs/branches/5.1/User_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.1/User_Guide/en-US/Revision_History.xml	2011-08-11 04:36:00 UTC (rev 7043)
+++ epp/docs/branches/5.1/User_Guide/en-US/Revision_History.xml	2011-08-11 04:41:47 UTC (rev 7044)
@@ -7,7 +7,63 @@
     <title>Revision History</title>
     <simpara>
         <revhistory>
+            <revision>
+                <revnumber>2-5.1.6</revnumber>
+                <date>Thu Aug 11 2011</date>
+                <author>
+                    <firstname>Scott</firstname>
+                    <surname>Mumford</surname>
+                    <email></email>
+                </author>
+                <revdescription>
+                    <simplelist>
+                        <member>Prep for 5.1.1 release.</member>
+                    </simplelist>
+                </revdescription>
+            </revision>
+            <revision>
+                <revnumber>2-5.1.5</revnumber>
+                <date>Wed Aug 10 2011</date>
+                <author>
+                    <firstname>Scott</firstname>
+                    <surname>Mumford</surname>
+                    <email></email>
+                </author>
+                <revdescription>
+                    <simplelist>
+                        <member>Incorporated QA feedback.</member>
+                    </simplelist>
+                </revdescription>
+            </revision>
+            <revision>
+            <revnumber>2-5.1.4</revnumber>
+            <date>Thu Aug 4 2011</date>
+            <author>
+                <firstname>Scott</firstname>
+                <surname>Mumford</surname>
+                <email></email>
+            </author>
+            <revdescription>
+                <simplelist>
+                    <member>BZ#692170: Added Portlet Container Concept section.</member>
+                </simplelist>
+            </revdescription>
+        </revision>
         <revision>
+            <revnumber>2-5.1.3</revnumber>
+            <date>Mon Aug 1 2011</date>
+            <author>
+                <firstname>Scott</firstname>
+                <surname>Mumford</surname>
+                <email></email>
+            </author>
+            <revdescription>
+                <simplelist>
+                    <member>Added "Supported Browsers" chapter.</member>
+                </simplelist>
+            </revdescription>
+        </revision>
+        <!--<revision>
             <revnumber>2-5.1.2</revnumber>
             <date>Fri Jul 15 2011</date>
             <author>
@@ -21,7 +77,7 @@
                 </simplelist>
             </revdescription>
         </revision>
-        <!--<revision>
+        <revision>
             <revnumber>2-5.1.1</revnumber>
             <date>Monday June 27 2011</date>
                 <author>
@@ -34,7 +90,7 @@
                             <member>Updated for 5.1.1 Release.</member>
                         </simplelist>
                     </revdescription>
-        </revision>-->
+        </revision>
         <revision>
             <revnumber>1-5.4</revnumber>
             <date>Wed June 22 2011</date>
@@ -50,7 +106,7 @@
                         </simplelist>
                     </revdescription>
         </revision>
-         <!--<revision>
+         <revision>
             <revnumber>1-5.3</revnumber>
             <date>Wed Jun 01 2011</date>
                <author>
@@ -63,7 +119,7 @@
                         <member>Added highlighting to 5.2.3 section header for review.</member>
                      </simplelist>
                   </revdescription>
-         </revision> -->
+         </revision>
          <revision>
             <revnumber>1-5.2</revnumber>
             <date>Thu Apr 7 2011</date>
@@ -78,7 +134,7 @@
                      </simplelist>
                   </revdescription>
          </revision>
-        <!-- <revision>
+         <revision>
             <revnumber>1-5.1</revnumber>
             <date>Tue Dec 21 2010</date>
                <author>

Modified: epp/docs/branches/5.1/User_Guide/en-US/User_Guide.xml
===================================================================
--- epp/docs/branches/5.1/User_Guide/en-US/User_Guide.xml	2011-08-11 04:36:00 UTC (rev 7043)
+++ epp/docs/branches/5.1/User_Guide/en-US/User_Guide.xml	2011-08-11 04:41:47 UTC (rev 7044)
@@ -4,17 +4,18 @@
 %BOOK_ENTITIES;
 ]>
 <book>
-	<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="modules/Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="modules/Terms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="modules/PortletsUser.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="modules/Account.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="modules/Portal.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="modules/Language.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="modules/GadgetsAdmin.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="modules/Further_Documentation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<index />
+    <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="modules/Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="modules/Supported_Browsers.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="modules/Terms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="modules/PortletsUser.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="modules/Account.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="modules/Portal.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="modules/Language.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="modules/GadgetsAdmin.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="modules/Further_Documentation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <index />
 </book>
 

Added: epp/docs/branches/5.1/User_Guide/en-US/modules/Supported_Browsers.xml
===================================================================
--- epp/docs/branches/5.1/User_Guide/en-US/modules/Supported_Browsers.xml	                        (rev 0)
+++ epp/docs/branches/5.1/User_Guide/en-US/modules/Supported_Browsers.xml	2011-08-11 04:41:47 UTC (rev 7044)
@@ -0,0 +1,43 @@
+<?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 "../User_Guide.ent">
+%BOOK_ENTITIES;
+]>
+
+<chapter>
+    <title>Supported Browsers</title>
+        <para>
+            JBoss Enterprise Portal Platform has been tested, and is supported, on the following web browsers:
+        </para>
+<!-- Source Metadata
+URL: https://jira.exoplatform.org/browse/WCM-1371
+Author [w/email]: Benjamin Paillereau (benjamin.paillereau at exoplatform.com) 
+License: 
+-->
+        <itemizedlist>
+            <listitem>
+                <para>
+                    <ulink type="http" url="http://www.mozilla.com/en-US/firefox/new/">Firefox</ulink> (versions 3 to 5).
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <ulink type="http" url="http://windows.microsoft.com/en-AU/internet-explorer/downloads/ie">Internet Explorer</ulink> (versions 7 and 8).
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <ulink type="http" url="http://www.google.com/chrome/">Google Chrome</ulink>.
+                </para>
+            </listitem>
+            <listitem>
+                <para>
+                    <ulink type="http" url="http://www.apple.com/safari/">Safari</ulink> (read-only).
+                </para>
+            </listitem>
+            
+        </itemizedlist>
+        <para>
+            This list will be expanded as newer browser versions are released and tested.
+        </para>
+</chapter>
\ No newline at end of file

Modified: epp/docs/branches/5.1/User_Guide/en-US/modules/Terms.xml
===================================================================
--- epp/docs/branches/5.1/User_Guide/en-US/modules/Terms.xml	2011-08-11 04:36:00 UTC (rev 7043)
+++ epp/docs/branches/5.1/User_Guide/en-US/modules/Terms.xml	2011-08-11 04:41:47 UTC (rev 7044)
@@ -4,13 +4,14 @@
 %BOOK_ENTITIES;
 ]>
 <chapter id="chap-User_Guide-Terms">
-	<title>Glossary</title>
-	<xi:include href="terms/Portal_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="terms/Portlet_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="terms/Toolbar_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="terms/Navigation_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="terms/Gadget_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="terms/Public_mode_and_Private_mode.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-	<xi:include href="terms/Permission_levels.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <title>Glossary</title>
+    <xi:include href="terms/Portal_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="terms/Portlet_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="terms/Portlet_container_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="terms/Toolbar_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="terms/Navigation_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="terms/Gadget_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="terms/Public_mode_and_Private_mode.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="terms/Permission_levels.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </chapter>
 

Modified: epp/docs/branches/5.1/User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml
===================================================================
--- epp/docs/branches/5.1/User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml	2011-08-11 04:36:00 UTC (rev 7043)
+++ epp/docs/branches/5.1/User_Guide/en-US/modules/account/Account_and_Password_Retrieval.xml	2011-08-11 04:41:47 UTC (rev 7044)
@@ -4,111 +4,110 @@
 %BOOK_ENTITIES;
 ]>
 <section id="sect-User_Guide-Account_and_Password_Retrieval">
-	<title>Account and Password Retrieval</title>
-	<para>
-		You can recover your username or password should you forget them by following these steps:
-	</para>
-	<procedure>
-		<step>
-			<para>
-				Click the link '<emphasis role="bold">Forgot your User Name/Password?</emphasis>'
-			</para>
-			<mediaobject>
-				<imageobject role="html">
-					<imagedata fileref="images/SignIn1.png" format="PNG" align="center" scale="100"/>
-				</imageobject>
-				<imageobject role="fo">
-					<imagedata fileref="images/SignIn1.png" format="PNG" align="center"  scalefit="1" contentwidth="100mm" />
-				</imageobject>
-			</mediaobject>
-		</step>
+    <title>Account and Password Retrieval</title>
+    <para>
+        You can recover your username or password should you forget them by following these steps:
+    </para>
+    <procedure>
+        <step>
+            <para>
+                Click the link '<emphasis role="bold">Forgot your User Name/Password?</emphasis>'
+            </para>
+            <mediaobject>
+                <imageobject role="html">
+                    <imagedata fileref="images/SignIn1.png" format="PNG" align="center" scale="100"/>
+                </imageobject>
+                <imageobject role="fo">
+                    <imagedata fileref="images/SignIn1.png" format="PNG" align="center"  scalefit="1" contentwidth="100mm" />
+                </imageobject>
+            </mediaobject>
+        </step>
 
-		<step>
-			<para>
-				The next screen offers two options:
-			</para>
-			<itemizedlist>
-				<listitem>
-					<para>
-						<emphasis role="bold">Forgot my password</emphasis>.
-					</para>
-				</listitem>
-				<listitem>
-					<para>
-						<emphasis role="bold">Forgot my username</emphasis>.
-					</para>
-				</listitem>
-			</itemizedlist>
-			<mediaobject>
-				<imageobject role="html">
-					<imagedata fileref="images/Forgot1.png" format="PNG" align="center" scale="100"/>
-				</imageobject>
-				<imageobject role="fo">
-					<imagedata fileref="images/Forgot1.png" format="PNG" align="center"  scalefit="1" contentwidth="100mm" />
-				</imageobject>
-			</mediaobject>
-			<para>
-				Select the appropriate option and click <emphasis role="bold">Next</emphasis>.
-			</para>
-		</step>
-		<step>
-			<para>
-				You will be prompted to provide identification information depending on which option you selected:
-			</para>
-			<itemizedlist>
-				<listitem>
-					<para>
-						If you selected the <emphasis role="bold">Forgot my password</emphasis> option you will be prompted for your username:
-					</para>
-					<mediaobject>
-						<imageobject role="html">
-							<imagedata fileref="images/ForgotUserName1.png" format="PNG" align="center" scale="100"/>
-						</imageobject>
-						<imageobject role="fo">
-							<imagedata fileref="images/ForgotUserName1.png" format="PNG" align="center"  scalefit="1" contentwidth="100mm"/>
-						</imageobject>
-					</mediaobject>
-				</listitem>
-				<listitem>
-					<para>
-						If you selected <emphasis role="bold">Forgot my username</emphasis> you will be prompted for your email address.
-					</para>
-					<mediaobject>
-						<imageobject role="html">
-							<imagedata fileref="images/ForgotEmail1.png" format="PNG" align="center" scale="100"/>
-						</imageobject>
-						<imageobject role="fo">
-							<imagedata fileref="images/ForgotEmail1.png" format="PNG" align="center"  scalefit="1" contentwidth="100mm" />
-						</imageobject>
-					</mediaobject>
-				</listitem>
-			</itemizedlist>
-		</step>
-	</procedure> 
-	<para>
-		After you submit the form an email will be send to your email address to assist you.
-	</para>
-	<para>
-		If you forgot your password you will be sent a link to application that will allow you to edit your password. Your original password will not be valid after this email is sent.
-	</para>
-	<important>
-		<title>Email Error</title>
-			<para>
-				If you receive an error message advising that the email could not be sent, you may need to configure (or reconfigure) your email settings in the <filename>configuration.properties</filename> file.
-			</para>
-			<mediaobject>
-				<imageobject role="html">
-					<imagedata fileref="images/EmailError.png" format="PNG" align="center" scale="90" />
-				</imageobject>
-				<imageobject role="fo">
-					<imagedata fileref="images/EmailError.png" format="PNG" align="center" contentwidth="120mm" />
-				</imageobject>
-				<caption>Incorrect email settings error message</caption>
-			</mediaobject>
-			<para>
-				More information about this configuration can be found in <emphasis role="bold">Section 5.2.2</emphasis> of the <emphasis role="bold">JBoss Enterprise Portal Platform Installation Guide</emphasis> at <ulink type="http" url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/">www.redhat.com</ulink>.
-			</para>
-	</important>
+        <step>
+            <para>
+                The next screen offers two options:
+            </para>
+            <itemizedlist>
+                <listitem>
+                    <para>
+                        <emphasis role="bold">Forgot my password</emphasis>.
+                    </para>
+                </listitem>
+                <listitem>
+                    <para>
+                        <emphasis role="bold">Forgot my username</emphasis>.
+                    </para>
+                </listitem>
+            </itemizedlist>
+            <mediaobject>
+                <imageobject role="html">
+                    <imagedata fileref="images/Forgot1.png" format="PNG" align="center" scale="100"/>
+                </imageobject>
+                <imageobject role="fo">
+                    <imagedata fileref="images/Forgot1.png" format="PNG" align="center"  scalefit="1" contentwidth="100mm" />
+                </imageobject>
+            </mediaobject>
+            <para>
+                Select the appropriate option and click <emphasis role="bold">Next</emphasis>.
+            </para>
+        </step>
+        <step>
+            <para>
+                You will be prompted to provide identification information depending on which option you selected:
+            </para>
+            <itemizedlist>
+                <listitem>
+                    <para>
+                        If you selected the <emphasis role="bold">Forgot my password</emphasis> option you will be prompted for your username:
+                    </para>
+                    <mediaobject>
+                        <imageobject role="html">
+                            <imagedata fileref="images/ForgotUserName1.png" format="PNG" align="center" scale="100"/>
+                        </imageobject>
+                        <imageobject role="fo">
+                            <imagedata fileref="images/ForgotUserName1.png" format="PNG" align="center"  scalefit="1" contentwidth="100mm"/>
+                        </imageobject>
+                    </mediaobject>
+                </listitem>
+                <listitem>
+                    <para>
+                        If you selected <emphasis role="bold">Forgot my username</emphasis> you will be prompted for your email address.
+                    </para>
+                    <mediaobject>
+                        <imageobject role="html">
+                            <imagedata fileref="images/ForgotEmail1.png" format="PNG" align="center" scale="100"/>
+                        </imageobject>
+                        <imageobject role="fo">
+                            <imagedata fileref="images/ForgotEmail1.png" format="PNG" align="center"  scalefit="1" contentwidth="100mm" />
+                        </imageobject>
+                    </mediaobject>
+                </listitem>
+            </itemizedlist>
+        </step>
+    </procedure> 
+    <para>
+        After you submit the form an email will be send to your email address to assist you.
+    </para>
+    <para>
+        If you forgot your password you will be sent a link to application that will allow you to edit your password. Your original password will not be valid after this email is sent.
+    </para>
+    <important>
+        <title>Email Error</title>
+            <para>
+                If you receive an error message advising that the email could not be sent, you may need to configure (or reconfigure) your email settings in the <filename>configuration.properties</filename> file.
+            </para>
+            <mediaobject>
+                <imageobject role="html">
+                    <imagedata fileref="images/EmailError.png" format="PNG" align="center" scale="90" />
+                </imageobject>
+                <imageobject role="fo">
+                    <imagedata fileref="images/EmailError.png" format="PNG" align="center" contentwidth="120mm" />
+                </imageobject>
+            </mediaobject>
+            <para>
+                More information about this configuration can be found in <emphasis role="bold">Section 5.2.2</emphasis> of the <emphasis role="bold">JBoss Enterprise Portal Platform Installation Guide</emphasis> at <ulink type="http" url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/">www.redhat.com</ulink>.
+            </para>
+    </important>
 </section>
 
 

Modified: epp/docs/branches/5.1/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml
===================================================================
--- epp/docs/branches/5.1/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml	2011-08-11 04:36:00 UTC (rev 7043)
+++ epp/docs/branches/5.1/User_Guide/en-US/modules/gadgetsAdmin/Manage_Portlets_and_Gadgets.xml	2011-08-11 04:41:47 UTC (rev 7044)
@@ -4,482 +4,490 @@
 %BOOK_ENTITIES;
 ]>
 <section id="sect-User_Guide-Manage_Portlets_and_Gadgets">
-	<title>Manage Portlets and Gadgets</title>
-		<para>
-			Portlets and gadgets are organized in different categories. Each category contains one or several portlets or gadgets. You can also mix portlets and gadgets into one category. By default all gadgets are placed in the <emphasis>Gadgets</emphasis> category.
-		</para>
-	
-		<section id="sect-User_Guide-Dashboard_Portlet-Display_Gadgets">
-		<title>Display Gadgets</title>
-		<para>
-			You can change the number of columns available in the Dashboard.
-		</para>
-		<procedure>
-			<step>
-				<para>
-					Go to the Dashboard (by clicking <emphasis role="bold">Dashboard</emphasis> in the Toolbar)
-				</para>
-			</step>
-			<step>
-				<para>
-					Hover over <emphasis role="bold">Dashboard Editor</emphasis> and click <emphasis role="bold">Edit Page</emphasis> in the drop-down menu.
-				</para>
-			</step>
-			<step>
-				<para>
-					The Page editor will appear. 
-				</para>
-			</step>
-			<step>
-				<para>
-					Hover over the <emphasis role="bold">Dashboard Portlet</emphasis> and click on the <emphasis role="bold">Edit</emphasis> icon (the 'pencil').
-				</para>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/Column.png" format="PNG" align="center" scale="100"/>
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/Column.png" format="PNG" align="center"  scalefit="1" contentwidth="120mm" />
-					</imageobject>
-				</mediaobject>
-			</step>
-			<step>
-				<para>
-					Change the number of columns in the <emphasis role="bold">Number of columns</emphasis> field. The maximum number of columns is four (4).
-				</para>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/Dash_Column.png" format="PNG" align="center" scale="100" />
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/Dash_Column.png" format="PNG" align="center" contentwidth="130mm" />
-					</imageobject>
-				</mediaobject>
-			</step>
-			<step>
-				<para>
-					Click the <emphasis role="bold">Save</emphasis> button to accept the change.
-				</para>
-			</step>
+    <title>Manage Portlets and Gadgets</title>
+        <para>
+            Portlets and gadgets are organized in different categories. Each category contains one or several portlets or gadgets. You can also mix portlets and gadgets into one category. By default all gadgets are placed in the <emphasis>Gadgets</emphasis> category.
+        </para>
+        <important>
+            <title>Gadget Preference Persistence</title>
+                <para>
+                    Administrators and users should be aware that adding a gadget to any portal page other than the dashboard, will result in any user set preferences or modifications (adding entries to the TODO gadget, for example) <emphasis role="bold">not</emphasis> being saved in a persistent manner.
+                </para>
+                <para>
+                    This limitation will be corrected in a later version of JBoss Enterprise Portal Platform.
+                </para>
+        </important>
+        <section id="sect-User_Guide-Dashboard_Portlet-Display_Gadgets">
+        <title>Display Gadgets</title>
+        <para>
+            You can change the number of columns available in the Dashboard.
+        </para>
+        <procedure>
+            <step>
+                <para>
+                    Go to the Dashboard (by clicking <emphasis role="bold">Dashboard</emphasis> in the Toolbar)
+                </para>
+            </step>
+            <step>
+                <para>
+                    Hover over <emphasis role="bold">Dashboard Editor</emphasis> and click <emphasis role="bold">Edit Page</emphasis> in the drop-down menu.
+                </para>
+            </step>
+            <step>
+                <para>
+                    The Page editor will appear. 
+                </para>
+            </step>
+            <step>
+                <para>
+                    Hover over the <emphasis role="bold">Dashboard Portlet</emphasis> and click on the <emphasis role="bold">Edit</emphasis> icon (the 'pencil').
+                </para>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/Column.png" format="PNG" align="center" scale="100"/>
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/Column.png" format="PNG" align="center"  scalefit="1" contentwidth="120mm" />
+                    </imageobject>
+                </mediaobject>
+            </step>
+            <step>
+                <para>
+                    Change the number of columns in the <emphasis role="bold">Number of columns</emphasis> field. The maximum number of columns is four (4).
+                </para>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/Dash_Column.png" format="PNG" align="center" scale="100" />
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/Dash_Column.png" format="PNG" align="center" contentwidth="130mm" />
+                    </imageobject>
+                </mediaobject>
+            </step>
+            <step>
+                <para>
+                    Click the <emphasis role="bold">Save</emphasis> button to accept the change.
+                </para>
+            </step>
          <step>
             <para>
                Click <emphasis role="bold">Close</emphasis> and then click <emphasis role="bold">Finish</emphasis>.
             </para>
          </step>
-		</procedure>
+        </procedure>
 
-	</section>
+    </section>
 
-	<section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Add_a_new_Category">
-		<title>Add a new Category</title>
-		<para>
-			You easily add a new category by following this guide:
-		</para>
-		<procedure>
-			<step>
-				<para>
-					Hover over the <emphasis role="bold">Group</emphasis> menu, then <emphasis role="bold">Administration</emphasis> and click on <emphasis role="bold">Application Registry</emphasis>.
-				</para>
-			</step>
-			<step>
-				<para>
-					Click the <emphasis role="bold">Add Category</emphasis> button on the action bar: 
-				</para>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/AddCategory1.png" format="PNG" align="center" scale="100" />
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/AddCategory1.png" format="PNG" align="center"  scalefit="1" contentwidth="150mm" />
-					</imageobject>
-				</mediaobject>
-				<para>
-					The <emphasis role="bold">Category Setting</emphasis> tab: includes common information about a category.
-				</para>
-		
-				<variablelist>
-					<varlistentry>
-						<term>Category name</term>
-						<listitem>
-							<para>
-								The name of the category. This field is required and its length must be between 3 and 30 characters. Only alpha, digit, dash and underscore characters are allowed. 
-							</para>
-						</listitem>
-					</varlistentry>
-					<varlistentry>
-						<term>Display name</term>
-						<listitem>
-							<para>
-								The display name of the category and its length must be between 3 and 30 characters.
-							</para>
-						</listitem>
-					</varlistentry>
-					<varlistentry>
-						<term>Description</term>
-						<listitem>
-							<para>
-								A brief description of the category. Any length from 0 to 255 characters is allowed.
-							</para>
-						</listitem>
-					</varlistentry>
-				</variablelist>
-				<para>
-					The <emphasis role="bold">Permission Setting</emphasis> tab provides access to the Permission manager.
-				</para>
-				<para>The permission criteria are used whenever a user creates or modifies a page. In that case the user can only see and use portlets in those categories on which he or she has access to (as defined by groups and memberships).
-				</para>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/Permission2.png" format="PNG" align="center" scale="100" />
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/Permission2.png" format="PNG" align="center"  scalefit="1" contentwidth="130mm" />
-					</imageobject>
-				</mediaobject>
-			</step>
+    <section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Add_a_new_Category">
+        <title>Add a new Category</title>
+        <para>
+            You easily add a new category by following this guide:
+        </para>
+        <procedure>
+            <step>
+                <para>
+                    Hover over the <emphasis role="bold">Group</emphasis> menu, then <emphasis role="bold">Administration</emphasis> and click on <emphasis role="bold">Application Registry</emphasis>.
+                </para>
+            </step>
+            <step>
+                <para>
+                    Click the <emphasis role="bold">Add Category</emphasis> button on the action bar: 
+                </para>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/AddCategory1.png" format="PNG" align="center" scale="100" />
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/AddCategory1.png" format="PNG" align="center"  scalefit="1" contentwidth="150mm" />
+                    </imageobject>
+                </mediaobject>
+                <para>
+                    The <emphasis role="bold">Category Setting</emphasis> tab: includes common information about a category.
+                </para>
+        
+                <variablelist>
+                    <varlistentry>
+                        <term>Category name</term>
+                        <listitem>
+                            <para>
+                                The name of the category. This field is required and its length must be between 3 and 30 characters. Only alpha, digit, dash and underscore characters are allowed. 
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>Display name</term>
+                        <listitem>
+                            <para>
+                                The display name of the category and its length must be between 3 and 30 characters.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>Description</term>
+                        <listitem>
+                            <para>
+                                A brief description of the category. Any length from 0 to 255 characters is allowed.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                </variablelist>
+                <para>
+                    The <emphasis role="bold">Permission Setting</emphasis> tab provides access to the Permission manager.
+                </para>
+                <para>The permission criteria are used whenever a user creates or modifies a page. In that case the user can only see and use portlets in those categories on which he or she has access to (as defined by groups and memberships).
+                </para>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/Permission2.png" format="PNG" align="center" scale="100" />
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/Permission2.png" format="PNG" align="center"  scalefit="1" contentwidth="130mm" />
+                    </imageobject>
+                </mediaobject>
+            </step>
 <!--
-			<step>
-				<para>
-					Enter values for required fields in this form.
-				</para>
-			</step>
-			<step>
-				<para>
-					Click the <emphasis role="bold">Save</emphasis> button to accept adding a new category into a category list. The new category will be added into a list on the left pane.
-				</para>
-			</step>
+            <step>
+                <para>
+                    Enter values for required fields in this form.
+                </para>
+            </step>
+            <step>
+                <para>
+                    Click the <emphasis role="bold">Save</emphasis> button to accept adding a new category into a category list. The new category will be added into a list on the left pane.
+                </para>
+            </step>
 -->
-		</procedure>
-	</section>
-	
-	<section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Edit_a_Category">
-		<title>Edit a Category</title>
-		<procedure>
-			<step>
-				<para>
-					Click the Edit icon located next to the title bar.
-				</para>
-			</step>
-			<step>
-				<para>
-					Update the category information.
-				</para>
-			</step>
-			<step>
-				<para>
-					Click the <emphasis role="bold">Save</emphasis> button to apply changes.
-				</para>
-			</step>
-		</procedure>
-	</section>
-	
-	<section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Delete_a_Category">
-		<title>Delete a Category</title>
-		<procedure>
-			<step>
-				<para>
-					Click the Trash can icon located next to the title bar.
-				</para>
-			</step>
-			<step>
-				<para>
-					Accept the deletion by clicking  <emphasis role="bold">OK</emphasis>
-				</para>
-			</step>
-		</procedure>
-	</section>
-	
-	<section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Add_PortletsGadgets_to_the_specific_Category">
-		<title>Add Applications to a Category</title>
-		<procedure>
-			<step>
-				<para>
-					Click the "Plus" icon located next to the category (in the list on the left) to which you want to add an application.  
-				</para>
-				<para>
-					The image below shows the available application. You will see this list when you click the "Plus" icon.
-				</para>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/AddPortlet2.png" format="PNG" align="center" scale="100" />
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/AddPortlet2.png" format="PNG" align="center"  scalefit="1" contentwidth="140mm" />
-					</imageobject>
-				</mediaobject>
-				<variablelist>
-					<varlistentry>
-						<term>Display name</term>
-							<listitem>
-								<para>
-									The display name of a portlet/gadget.
-								</para>
-							</listitem>
-					</varlistentry>
-					<varlistentry>
-						<term>Application Type</term> 
-						<listitem>
-							<para>
-								Either Portlet, Gadget or WSRP application.
-							</para>
-						</listitem>
-					</varlistentry>
-				</variablelist>
-			</step>
-			<step>
-				<para>
-					Enter the display name and select a type
-				</para>
-			</step>
-			<step>
-				<para>
-					Select an application by checking the radio button. Note that there several pages of Portlet applications to choose from and that the content of the list changes when you select a different type of application from the <emphasis role="bold">Application Type</emphasis> drop-down menu.
-				</para>
-			</step>
-			<step>
-				<para>
-					Click the <emphasis role="bold">Save</emphasis> button to add the selected application to the category.
-				</para>
-			</step>
-		</procedure>
-	</section>
-	
-	<section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Set_Access_Permission_on_Portlets">
-		<title>Set Access Permission on Portlets</title>
+        </procedure>
+    </section>
+    
+    <section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Edit_a_Category">
+        <title>Edit a Category</title>
+        <procedure>
+            <step>
+                <para>
+                    Click the Edit icon located next to the title bar.
+                </para>
+            </step>
+            <step>
+                <para>
+                    Update the category information.
+                </para>
+            </step>
+            <step>
+                <para>
+                    Click the <emphasis role="bold">Save</emphasis> button to apply changes.
+                </para>
+            </step>
+        </procedure>
+    </section>
+    
+    <section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Delete_a_Category">
+        <title>Delete a Category</title>
+        <procedure>
+            <step>
+                <para>
+                    Click the Trash can icon located next to the title bar.
+                </para>
+            </step>
+            <step>
+                <para>
+                    Accept the deletion by clicking  <emphasis role="bold">OK</emphasis>
+                </para>
+            </step>
+        </procedure>
+    </section>
+    
+    <section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Add_PortletsGadgets_to_the_specific_Category">
+        <title>Add Applications to a Category</title>
+        <procedure>
+            <step>
+                <para>
+                    Click the "Plus" icon located next to the category (in the list on the left) to which you want to add an application.  
+                </para>
+                <para>
+                    The image below shows the available application. You will see this list when you click the "Plus" icon.
+                </para>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/AddPortlet2.png" format="PNG" align="center" scale="100" />
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/AddPortlet2.png" format="PNG" align="center"  scalefit="1" contentwidth="140mm" />
+                    </imageobject>
+                </mediaobject>
+                <variablelist>
+                    <varlistentry>
+                        <term>Display name</term>
+                            <listitem>
+                                <para>
+                                    The display name of a portlet/gadget.
+                                </para>
+                            </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>Application Type</term> 
+                        <listitem>
+                            <para>
+                                Either Portlet, Gadget or WSRP application.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                </variablelist>
+            </step>
+            <step>
+                <para>
+                    Enter the display name and select a type
+                </para>
+            </step>
+            <step>
+                <para>
+                    Select an application by checking the radio button. Note that there several pages of Portlet applications to choose from and that the content of the list changes when you select a different type of application from the <emphasis role="bold">Application Type</emphasis> drop-down menu.
+                </para>
+            </step>
+            <step>
+                <para>
+                    Click the <emphasis role="bold">Save</emphasis> button to add the selected application to the category.
+                </para>
+            </step>
+        </procedure>
+    </section>
+    
+    <section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Set_Access_Permission_on_Portlets">
+        <title>Set Access Permission on Portlets</title>
 
-		<procedure>
-			<step>
-				<para>
-					In the <emphasis role="bold">Group</emphasis> menu, select <emphasis role="bold">Administration</emphasis> and then <emphasis role="bold">Application Registry</emphasis>.
-				</para>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/PortletPermission.png" format="PNG" align="center" scale="100"/>
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/PortletPermission.png" format="PNG" align="center" contentwidth="160mm"/>
-					</imageobject>
-				</mediaobject>
-			</step>
-			<step>
-				<para>
-					Select a category in the Category pane that includes the portlet you want to set permissions on. All portlets of that category will be listed underneath.
-				</para>
-			</step>
-			<step>
-				<para>
-					To set permission for a portlet: 
-				</para>
-				<itemizedlist>
-					<listitem>
-						<para>
-							Click the <emphasis role="bold">Add Permission</emphasis> button to add access permissions to more groups.
-						</para>
-						<mediaobject>
-							<imageobject role="html">
-								<imagedata fileref="images/AddPermission.png" format="PNG" align="center" scale="100" />
-							</imageobject>
-							<imageobject role="fo">
-								<imagedata fileref="images/AddPermission.png" format="PNG" align="center"  scalefit="1" contentwidth="150mm" />
-							</imageobject>
-						</mediaobject>
-					</listitem>
-					<listitem>
-						<para>
-							Or check <emphasis role="bold">Make it public</emphasis> to allow everyone to access.
-						</para>
-					</listitem>
-				</itemizedlist>
-				<para>
-					Whenever the user creates or modifies a page, he or she can only see and use gadgets/portlets that fulfill two conditions: the portlet is in a <emphasis role="bold">category</emphasis> which the user has access permission too and the user has access permission on the <emphasis role="bold">portlet</emphasis>
-				</para>
-			</step>
-		</procedure>	
-	</section>
-	
-	<section id="sect-User_Guide-Manage_Portlets_and_Gadgets-View_detail_information_of_the_specific_Portlets">
-		<title>View/Edit portlet/gadget information</title>
-			<para>
-					In the <emphasis role="bold">Group</emphasis> menu, select <emphasis role="bold">Administration</emphasis> then <emphasis role="bold">Application Registry</emphasis>. 
-				</para>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/Org1.png" format="PNG" align="center" scale="100" />
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/Org1.png" format="PNG" align="center"  scalefit="1" contentwidth="150mm" />
-					</imageobject>
-				</mediaobject>
-			<variablelist>
-					<varlistentry>
-						<term><emphasis role="bold">Left pane</emphasis></term>
-							<listitem>
-								<para>
-									All portlets and gadgets grouped by categories
-								</para>
-							</listitem>
-					</varlistentry>
-					<varlistentry>
-						<term><emphasis role="bold">Right pane</emphasis></term>
-							<listitem>
-								<para>
-									shows detail information about a portlet: Name, Display name, Description and Portlet preferences.
-								</para>
-							</listitem>
-						</varlistentry>
-				</variablelist>
-				<para>
-					To see the details of any portlet select it from the list on the left.
-				</para>
-				<para>
-					To edit a portlet, click the edit button to the right of the portlet's name:
-				</para>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/EditApplication.png" format="PNG" align="center" scale="100" />
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/EditApplication.png" format="PNG" align="center"  scalefit="1" contentwidth="150mm" />
-					</imageobject>
-				</mediaobject>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/EditApplicationInformation.png" format="PNG" align="center" scale="100" />
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/EditApplicationInformation.png" format="PNG" align="center"  scalefit="1" contentwidth="90mm" />
-					</imageobject>
-				</mediaobject>
-	</section>
-	
-	<section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Add_a_Gadget">
-		<title>Add a Gadget</title>
-		<para>
-			In the <emphasis role="bold">Group</emphasis> menu, select <emphasis role="bold">Administration</emphasis> then <emphasis role="bold">Application Registry</emphasis>. Click on the <emphasis role="bold">Gadget</emphasis> icon.
-		</para>
-		<para>
-			You may add a remote gadget using its URL or create a brand-new one:
-		</para>
+        <procedure>
+            <step>
+                <para>
+                    In the <emphasis role="bold">Group</emphasis> menu, select <emphasis role="bold">Administration</emphasis> and then <emphasis role="bold">Application Registry</emphasis>.
+                </para>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/PortletPermission.png" format="PNG" align="center" scale="100"/>
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/PortletPermission.png" format="PNG" align="center" contentwidth="160mm"/>
+                    </imageobject>
+                </mediaobject>
+            </step>
+            <step>
+                <para>
+                    Select a category in the Category pane that includes the portlet you want to set permissions on. All portlets of that category will be listed underneath.
+                </para>
+            </step>
+            <step>
+                <para>
+                    To set permission for a portlet: 
+                </para>
+                <itemizedlist>
+                    <listitem>
+                        <para>
+                            Click the <emphasis role="bold">Add Permission</emphasis> button to add access permissions to more groups.
+                        </para>
+                        <mediaobject>
+                            <imageobject role="html">
+                                <imagedata fileref="images/AddPermission.png" format="PNG" align="center" scale="100" />
+                            </imageobject>
+                            <imageobject role="fo">
+                                <imagedata fileref="images/AddPermission.png" format="PNG" align="center"  scalefit="1" contentwidth="150mm" />
+                            </imageobject>
+                        </mediaobject>
+                    </listitem>
+                    <listitem>
+                        <para>
+                            Or check <emphasis role="bold">Make it public</emphasis> to allow everyone to access.
+                        </para>
+                    </listitem>
+                </itemizedlist>
+                <para>
+                    Whenever the user creates or modifies a page, he or she can only see and use gadgets/portlets that fulfill two conditions: the portlet is in a <emphasis role="bold">category</emphasis> which the user has access permission too and the user has access permission on the <emphasis role="bold">portlet</emphasis>
+                </para>
+            </step>
+        </procedure>    
+    </section>
+    
+    <section id="sect-User_Guide-Manage_Portlets_and_Gadgets-View_detail_information_of_the_specific_Portlets">
+        <title>View/Edit portlet/gadget information</title>
+            <para>
+                    In the <emphasis role="bold">Group</emphasis> menu, select <emphasis role="bold">Administration</emphasis> then <emphasis role="bold">Application Registry</emphasis>. 
+                </para>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/Org1.png" format="PNG" align="center" scale="100" />
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/Org1.png" format="PNG" align="center"  scalefit="1" contentwidth="150mm" />
+                    </imageobject>
+                </mediaobject>
+            <variablelist>
+                    <varlistentry>
+                        <term><emphasis role="bold">Left pane</emphasis></term>
+                            <listitem>
+                                <para>
+                                    All portlets and gadgets grouped by categories
+                                </para>
+                            </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term><emphasis role="bold">Right pane</emphasis></term>
+                            <listitem>
+                                <para>
+                                    shows detail information about a portlet: Name, Display name, Description and Portlet preferences.
+                                </para>
+                            </listitem>
+                        </varlistentry>
+                </variablelist>
+                <para>
+                    To see the details of any portlet select it from the list on the left.
+                </para>
+                <para>
+                    To edit a portlet, click the edit button to the right of the portlet's name:
+                </para>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/EditApplication.png" format="PNG" align="center" scale="100" />
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/EditApplication.png" format="PNG" align="center"  scalefit="1" contentwidth="150mm" />
+                    </imageobject>
+                </mediaobject>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/EditApplicationInformation.png" format="PNG" align="center" scale="100" />
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/EditApplicationInformation.png" format="PNG" align="center"  scalefit="1" contentwidth="90mm" />
+                    </imageobject>
+                </mediaobject>
+    </section>
+    
+    <section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Add_a_Gadget">
+        <title>Add a Gadget</title>
+        <para>
+            In the <emphasis role="bold">Group</emphasis> menu, select <emphasis role="bold">Administration</emphasis> then <emphasis role="bold">Application Registry</emphasis>. Click on the <emphasis role="bold">Gadget</emphasis> icon.
+        </para>
+        <para>
+            You may add a remote gadget using its URL or create a brand-new one:
+        </para>
 
-			<procedure>
-				<title>Add a Remote Gadget</title>
-					<step>
-						<para>
-							Click on <emphasis role="bold">Add a remote gadget</emphasis>:
-						</para>
-						<mediaobject>
-							<imageobject role="html">
-								<imagedata fileref="images/AddGadgetnew.png" format="PNG" align="center" scale="100" />
-							</imageobject>
-							<imageobject role="fo">
-								<imagedata fileref="images/AddGadgetnew.png" format="PNG" align="center" contentwidth="150mm" />
-							</imageobject>
-						</mediaobject>
-					</step>
-					<step>
-						<para>
-							Enter the url of the remote gadget in the <emphasis role="bold">URL</emphasis> field.
-						</para>
-						<mediaobject>
-							<imageobject role="html">
-								<imagedata fileref="images/AddGadgetnewUrl.png" format="PNG" align="center" scale="100" />
-							</imageobject>
-							<imageobject role="fo">
-								<imagedata fileref="images/AddGadgetnewUrl.png" format="PNG" align="center"  scalefit="1" contentwidth="150mm" />
-							</imageobject>
-						</mediaobject>
-					</step>
-					<step>
-						<para>
-							Click <emphasis role="bold">Add</emphasis>. The new remote gadget will be appear in gadget list on left pane.
-						</para>
-					</step>
-					</procedure>
-					<procedure>
-						<title>Create a new Gadget</title>
-						<step>
-							<para>
-								Click on <emphasis role="bold">Create a new gadget</emphasis>:
-							</para>
-						<mediaobject>
-							<imageobject role="html">
-								<imagedata fileref="images/CreateGadget1.png" format="PNG" align="center" scale="100"/>
-							</imageobject>
-							<imageobject role="fo">
-								<imagedata fileref="images/CreateGadget1.png" format="PNG" align="center"  scalefit="1" contentwidth="150mm"/>
-							</imageobject>
-						</mediaobject>
-						</step>
-						<step>
-							<para>
-								Populate the <literal>Source</literal> field with the xml code of the new gadget.
-							</para>
-						</step>
-					</procedure>
-			<para>
-				You can edit or refresh a gadget using the icons in the top right of the <emphasis role="bold">Gadget Details</emphasis> pane. 
-			</para>
-			<para>
-				You can delete a local gadget using the trashcan icon to the right of the appropriate gadget in the gadget list.
-			</para>
-			<mediaobject>
-				<imageobject role="html">
-					<imagedata fileref="images/ActionGadget.png" format="PNG" align="center" scale="100" />
-				</imageobject>
-				<imageobject role="fo">
-					<imagedata fileref="images/ActionGadget.png" format="PNG" align="center" contentwidth="150mm" />
-				</imageobject>
-			</mediaobject>
-	</section>
-	
-	<section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Add_a_new_Gadget_to_the_Dashboard_Portlet">
-		<title>Add a new Gadget to the Dashboard Portlet</title>
-			<para>
-				See <xref linkend="sect-User_Guide-Dashboard_Portlet-Add_Gadgets"/> for instructions on how to add new gadgets to the dashboard.
-			</para>
-	</section>
-	
-	<section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Manage_Gadgets">
-		<title>Manage Gadgets</title>
+            <procedure>
+                <title>Add a Remote Gadget</title>
+                    <step>
+                        <para>
+                            Click on <emphasis role="bold">Add a remote gadget</emphasis>:
+                        </para>
+                        <mediaobject>
+                            <imageobject role="html">
+                                <imagedata fileref="images/AddGadgetnew.png" format="PNG" align="center" scale="100" />
+                            </imageobject>
+                            <imageobject role="fo">
+                                <imagedata fileref="images/AddGadgetnew.png" format="PNG" align="center" contentwidth="150mm" />
+                            </imageobject>
+                        </mediaobject>
+                    </step>
+                    <step>
+                        <para>
+                            Enter the url of the remote gadget in the <emphasis role="bold">URL</emphasis> field.
+                        </para>
+                        <mediaobject>
+                            <imageobject role="html">
+                                <imagedata fileref="images/AddGadgetnewUrl.png" format="PNG" align="center" scale="100" />
+                            </imageobject>
+                            <imageobject role="fo">
+                                <imagedata fileref="images/AddGadgetnewUrl.png" format="PNG" align="center"  scalefit="1" contentwidth="150mm" />
+                            </imageobject>
+                        </mediaobject>
+                    </step>
+                    <step>
+                        <para>
+                            Click <emphasis role="bold">Add</emphasis>. The new remote gadget will be appear in gadget list on left pane.
+                        </para>
+                    </step>
+                    </procedure>
+                    <procedure>
+                        <title>Create a new Gadget</title>
+                        <step>
+                            <para>
+                                Click on <emphasis role="bold">Create a new gadget</emphasis>:
+                            </para>
+                        <mediaobject>
+                            <imageobject role="html">
+                                <imagedata fileref="images/CreateGadget1.png" format="PNG" align="center" scale="100"/>
+                            </imageobject>
+                            <imageobject role="fo">
+                                <imagedata fileref="images/CreateGadget1.png" format="PNG" align="center"  scalefit="1" contentwidth="150mm"/>
+                            </imageobject>
+                        </mediaobject>
+                        </step>
+                        <step>
+                            <para>
+                                Populate the <literal>Source</literal> field with the xml code of the new gadget.
+                            </para>
+                        </step>
+                    </procedure>
+            <para>
+                You can edit or refresh a gadget using the icons in the top right of the <emphasis role="bold">Gadget Details</emphasis> pane. 
+            </para>
+            <para>
+                You can delete a local gadget using the trashcan icon to the right of the appropriate gadget in the gadget list.
+            </para>
+            <mediaobject>
+                <imageobject role="html">
+                    <imagedata fileref="images/ActionGadget.png" format="PNG" align="center" scale="100" />
+                </imageobject>
+                <imageobject role="fo">
+                    <imagedata fileref="images/ActionGadget.png" format="PNG" align="center" contentwidth="150mm" />
+                </imageobject>
+            </mediaobject>
+    </section>
+    
+    <section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Add_a_new_Gadget_to_the_Dashboard_Portlet">
+        <title>Add a new Gadget to the Dashboard Portlet</title>
+            <para>
+                See <xref linkend="sect-User_Guide-Dashboard_Portlet-Add_Gadgets"/> for instructions on how to add new gadgets to the dashboard.
+            </para>
+    </section>
+    
+    <section id="sect-User_Guide-Manage_Portlets_and_Gadgets-Manage_Gadgets">
+        <title>Manage Gadgets</title>
 
-		<section id="sect-User_Guide-Manage_Gadgets-Edit_a_Gadget">
-			<title>Edit a Gadget</title>
-				<para>
-					Click the <emphasis role="bold">Edit Gadget</emphasis> icon located in the header of the <emphasis role="bold">Gadget Details</emphasis> page to display the following window: 
-				</para>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/Source.png" format="PNG" align="center" scale="100" />
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/Source.png" format="PNG" align="center" contentwidth="150mm" />
-					</imageobject>
-				</mediaobject>
-		</section>
-		
+        <section id="sect-User_Guide-Manage_Gadgets-Edit_a_Gadget">
+            <title>Edit a Gadget</title>
+                <para>
+                    Click the <emphasis role="bold">Edit Gadget</emphasis> icon located in the header of the <emphasis role="bold">Gadget Details</emphasis> page to display the following window: 
+                </para>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/Source.png" format="PNG" align="center" scale="100" />
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/Source.png" format="PNG" align="center" contentwidth="150mm" />
+                    </imageobject>
+                </mediaobject>
+        </section>
+        
 <!--Covered in section above SM
-		<section id="sect-User_Guide-Manage_Gadgets-Refresh_a_Gadget">
-			<title>Refresh a Gadget</title>
-				<para>
-					Click the <emphasis role="bold">Refresh information</emphasis> icon located in the header of the <emphasis role="bold">Gadget Details</emphasis> page to display the following window: 
-				</para>
+        <section id="sect-User_Guide-Manage_Gadgets-Refresh_a_Gadget">
+            <title>Refresh a Gadget</title>
+                <para>
+                    Click the <emphasis role="bold">Refresh information</emphasis> icon located in the header of the <emphasis role="bold">Gadget Details</emphasis> page to display the following window: 
+                </para>
 
-		</section>
-		
-		<section id="sect-User_Guide-Manage_Gadgets-Delete_a_Gadget">
-			<title>Delete a Gadget</title>
+        </section>
+        
+        <section id="sect-User_Guide-Manage_Gadgets-Delete_a_Gadget">
+            <title>Delete a Gadget</title>
 
-				<para>
-					Click the trash can icon located next to the name of the gadget. An alert message should pop up asking for confirmation: 
-				</para>
-				<mediaobject>
-					<imageobject>
-						<imagedata fileref="images/Delete.png" format="PNG" align="center" />
-					</imageobject>
-				</mediaobject>
-		</section> -->
+                <para>
+                    Click the trash can icon located next to the name of the gadget. An alert message should pop up asking for confirmation: 
+                </para>
+                <mediaobject>
+                    <imageobject>
+                        <imagedata fileref="images/Delete.png" format="PNG" align="center" />
+                    </imageobject>
+                </mediaobject>
+        </section> -->
 
-	</section>
+    </section>
 
 </section>
 

Modified: epp/docs/branches/5.1/User_Guide/en-US/modules/portal/Manage_Portals.xml
===================================================================
--- epp/docs/branches/5.1/User_Guide/en-US/modules/portal/Manage_Portals.xml	2011-08-11 04:36:00 UTC (rev 7043)
+++ epp/docs/branches/5.1/User_Guide/en-US/modules/portal/Manage_Portals.xml	2011-08-11 04:41:47 UTC (rev 7044)
@@ -161,7 +161,7 @@
         
         </section>
     <section id="proc-User_Guide-Manage_Portals-Edit_Layout">
-      <title><remark>Edit Layout</remark></title>
+      <title>Edit Layout</title>
             <para>
                 To edit the layout of a portal, click the <emphasis>Edit Layout</emphasis> key beside the active portal you wish to edit:
             </para>

Modified: epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml
===================================================================
--- epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml	2011-08-11 04:36:00 UTC (rev 7043)
+++ epp/docs/branches/5.1/User_Guide/en-US/modules/portletsUser/Dashboard_Portlet.xml	2011-08-11 04:41:47 UTC (rev 7044)
@@ -4,75 +4,75 @@
 %BOOK_ENTITIES;
 ]>
 <section id="sect-User_Guide-Dashboard_Portlet">
-	<title>The Dashboard</title>
-	<para>
-		The Dashboard is used for hosting mini applications known as gadgets. The Dashboard uses a variety of graphical effects for displaying, opening and using gadgets.
-	</para>
-		<para>
-			The active Dashboard can be individually named by double clicking on the default name ("<emphasis>Click and Type Page Name</emphasis>")...
-		</para>
-		<mediaobject>
-			<imageobject role="html">
-				<imagedata fileref="images/Dashname.png" format="PNG" align="center" scale="100"/>
-			</imageobject>
-			<imageobject role="fo">
-				<imagedata fileref="images/Dashname.png" format="PNG" align="center" scalefit="1" contentwidth="120mm"/>
-			</imageobject>
-		</mediaobject>
-		<para>
-			...and entering a new name:
-		</para>
-		<mediaobject>
-			<imageobject role="html">
-				<imagedata fileref="images/Dashname1.png" format="PNG" align="center" scale="100"/>
-			</imageobject>
-			<imageobject role="fo">
-				<imagedata fileref="images/Dashname1.png" format="PNG" align="center" scalefit="1" contentwidth="120mm"/>
-			</imageobject>
-		</mediaobject>
-		<para>
-			The Dashboard can also be tabbed to create multiple spaces. Open a new tab by clicking the <emphasis role="bold">+</emphasis> button beside the Dashboard name.
-		</para>
-		<mediaobject>
-			<imageobject role="html">
-				<imagedata fileref="images/tabbed_dash.png" format="PNG" align="center" scale="100" />
-			</imageobject>
-			<imageobject role="fo">
-				<imagedata fileref="images/tabbed_dash.png" format="PNG" align="center" contentwidth="110mm" />
-			</imageobject>
-		</mediaobject>
-		<para>
-			New tabs can also be individually named and managed.
-		</para>
-		<para>
-			Gadgets within the Dashboard can be moved and rearranged. New gadgets can be created and unnecessary ones deleted. More than one instance of the same gadget can be opened at the same time and each instance of the same gadget can have different settings. The gadgets instances are completely independent.
-		</para>
+    <title>The Dashboard</title>
+    <para>
+        The Dashboard is used for hosting mini applications known as gadgets. The Dashboard uses a variety of graphical effects for displaying, opening and using gadgets.
+    </para>
+        <para>
+            The active Dashboard can be individually named by double clicking on the default name ("<emphasis>Click and Type Page Name</emphasis>")...
+        </para>
+        <mediaobject>
+            <imageobject role="html">
+                <imagedata fileref="images/Dashname.png" format="PNG" align="center" scale="100"/>
+            </imageobject>
+            <imageobject role="fo">
+                <imagedata fileref="images/Dashname.png" format="PNG" align="center" scalefit="1" contentwidth="120mm"/>
+            </imageobject>
+        </mediaobject>
+        <para>
+            ...and entering a new name:
+        </para>
+        <mediaobject>
+            <imageobject role="html">
+                <imagedata fileref="images/Dashname1.png" format="PNG" align="center" scale="100"/>
+            </imageobject>
+            <imageobject role="fo">
+                <imagedata fileref="images/Dashname1.png" format="PNG" align="center" scalefit="1" contentwidth="120mm"/>
+            </imageobject>
+        </mediaobject>
+        <para>
+            The Dashboard can also be tabbed to create multiple spaces. Open a new tab by clicking the <emphasis role="bold">+</emphasis> button beside the Dashboard name.
+        </para>
+        <mediaobject>
+            <imageobject role="html">
+                <imagedata fileref="images/tabbed_dash.png" format="PNG" align="center" scale="100" />
+            </imageobject>
+            <imageobject role="fo">
+                <imagedata fileref="images/tabbed_dash.png" format="PNG" align="center" contentwidth="110mm" />
+            </imageobject>
+        </mediaobject>
+        <para>
+            New tabs can also be individually named and managed.
+        </para>
+        <para>
+            Gadgets within the Dashboard can be moved and rearranged. New gadgets can be created and unnecessary ones deleted. More than one instance of the same gadget can be opened at the same time and each instance of the same gadget can have different settings. The gadgets instances are completely independent.
+        </para>
 
-	<section id="sect-User_Guide-Dashboard_Portlet-Using_the_Dashboard_Workspace">
-		<title>Using the Dashboard Workspace</title>
-		<procedure>
-			<step>
-				<para>
-					Click on <emphasis role="bold">Dashboard</emphasis> in the toolbar to access the Dashboard.
-				</para>
-			</step>
-			<step>
-				<para>
-				 	Click on <emphasis role="bold">Add Gadgets</emphasis> to open the Dashboard Workspace.
-				</para>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scale="100" />
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/Dashboard1.png" format="PNG" align="center"  scalefit="1" contentwidth="100mm" />
-					</imageobject>
-				</mediaobject>
-			</step>
-		</procedure>
-		<para>
-			The Dashboard Workspace lists all available gadgets. Four gadgets are provided by default with JBoss Enterprise Portal Platform, however you can add many more.
-		</para>
+    <section id="sect-User_Guide-Dashboard_Portlet-Using_the_Dashboard_Workspace">
+        <title>Using the Dashboard Workspace</title>
+        <procedure>
+            <step>
+                <para>
+                    Click on <emphasis role="bold">Dashboard</emphasis> in the toolbar to access the Dashboard.
+                </para>
+            </step>
+            <step>
+                <para>
+                    Click on <emphasis role="bold">Add Gadgets</emphasis> to open the Dashboard Workspace.
+                </para>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scale="100" />
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/Dashboard1.png" format="PNG" align="center"  scalefit="1" contentwidth="100mm" />
+                    </imageobject>
+                </mediaobject>
+            </step>
+        </procedure>
+        <para>
+            The Dashboard Workspace lists all available gadgets. Four gadgets are provided by default with JBoss Enterprise Portal Platform, however you can add many more.
+        </para>
       <mediaobject>
          <imageobject role="html">
             <imagedata fileref="images/Dash_Workspace.png" format="PNG" align="center" scale="100" />
@@ -81,201 +81,201 @@
             <imagedata fileref="images/Dash_Workspace.png" format="PNG" align="center" contentwidth="70mm" />
          </imageobject>
       </mediaobject>
-		<variablelist id="vari-User_Guide-Using_the_Dashboard_Workspace-Default_Gadgets">
-			<title>Default Gadgets:</title>
-			<varlistentry>
-				<term><emphasis role="bold">Calendar</emphasis></term>
-				<listitem>
-					<para>
-						The calendar gadget helps track and plan your events and activities.
-					</para>
-					<mediaobject>
-						<imageobject role="html">
-							<imagedata fileref="images/Calendar.png" format="PNG" align="center" scale="100"/>
-						</imageobject>
-						<imageobject role="fo">
-							<imagedata fileref="images/Calendar.png" format="PNG" align="center" scalefit="1"  contentwidth="70mm"/>
-						</imageobject>
-					</mediaobject>
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term><emphasis role="bold">Todo</emphasis></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.
-					</para>
-					<mediaobject>
-						<imageobject role="html">
-							<imagedata fileref="images/Todo.png" format="PNG" align="center" scale="100"/>
-						</imageobject>
-						<imageobject role="fo">
-							<imagedata fileref="images/Todo.png" format="PNG" align="center" scalefit="1"  contentwidth="70mm"/>
-						</imageobject>
-					</mediaobject>
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term><emphasis role="bold">Calculator</emphasis></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 role="html">
-							<imagedata fileref="images/Calculator.png" format="PNG" align="center" scale="100"/>
-						</imageobject>
-						<imageobject role="fo">
-							<imagedata fileref="images/Calculator.png" format="PNG" align="center" scalefit="1"  contentwidth="70mm"/>
-						</imageobject>
-					</mediaobject>
-				</listitem>
-			</varlistentry>
-			<varlistentry>
-				<term><emphasis role="bold">RSS Reader</emphasis></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 role="html">
-							<imagedata fileref="images/RSSReader.png" format="PNG" align="center" scale="100"/>
-						</imageobject>
-						<imageobject role="fo">
-							<imagedata fileref="images/RSSReader.png" format="PNG" align="center" scalefit="1"  contentwidth="70mm"/>
-						</imageobject>
-					</mediaobject> 
-				</listitem>
-			</varlistentry>
-		</variablelist>
-		<para>
-			To use one of the default gadgets, simply drag it from the <emphasis role="bold">Dashboard Workspace</emphasis> onto your Dashboard as illustrated below:
-		</para>
-		<mediaobject>
-			<imageobject role="html">
-				<imagedata fileref="images/Dash2.png" format="PNG" align="center" scale="100"/>
-			</imageobject>
-			<imageobject role="fo">
-				<imagedata fileref="images/Dash2.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/>
-			</imageobject>
-		</mediaobject>
-	</section>
-		
-	<section id="sect-User_Guide-Dashboard_Portlet-Add_Gadgets">
-		<title>Add Gadgets</title>
-			<para>
-				Many more gadgets can be found at <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadgets</ulink>. JBoss Enterprise Portal Platform is compatible with most of the gadgets available there.
-			</para>
-			<mediaobject>
-				<imageobject role="html">
-					<imagedata fileref="images/GoogleGadgets.png" format="PNG" align="center" scale="100"/>
-				</imageobject>
-				<imageobject role="fo">
-					<imagedata fileref="images/GoogleGadgets.png" format="PNG" align="center" scalefit="1"  contentwidth="160mm"/>
-				</imageobject>
-			</mediaobject>				
+        <variablelist id="vari-User_Guide-Using_the_Dashboard_Workspace-Default_Gadgets">
+            <title>Default Gadgets:</title>
+            <varlistentry>
+                <term><emphasis role="bold">Calendar</emphasis></term>
+                <listitem>
+                    <para>
+                        The calendar gadget helps track and plan your events and activities.
+                    </para>
+                    <mediaobject>
+                        <imageobject role="html">
+                            <imagedata fileref="images/Calendar.png" format="PNG" align="center" scale="100"/>
+                        </imageobject>
+                        <imageobject role="fo">
+                            <imagedata fileref="images/Calendar.png" format="PNG" align="center" scalefit="1"  contentwidth="70mm"/>
+                        </imageobject>
+                    </mediaobject>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term><emphasis role="bold">Todo</emphasis></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.
+                    </para>
+                    <mediaobject>
+                        <imageobject role="html">
+                            <imagedata fileref="images/Todo.png" format="PNG" align="center" scale="100"/>
+                        </imageobject>
+                        <imageobject role="fo">
+                            <imagedata fileref="images/Todo.png" format="PNG" align="center" scalefit="1"  contentwidth="70mm"/>
+                        </imageobject>
+                    </mediaobject>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term><emphasis role="bold">Calculator</emphasis></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 role="html">
+                            <imagedata fileref="images/Calculator.png" format="PNG" align="center" scale="100"/>
+                        </imageobject>
+                        <imageobject role="fo">
+                            <imagedata fileref="images/Calculator.png" format="PNG" align="center" scalefit="1"  contentwidth="70mm"/>
+                        </imageobject>
+                    </mediaobject>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term><emphasis role="bold">RSS Reader</emphasis></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 role="html">
+                            <imagedata fileref="images/RSSReader.png" format="PNG" align="center" scale="100"/>
+                        </imageobject>
+                        <imageobject role="fo">
+                            <imagedata fileref="images/RSSReader.png" format="PNG" align="center" scalefit="1"  contentwidth="70mm"/>
+                        </imageobject>
+                    </mediaobject> 
+                </listitem>
+            </varlistentry>
+        </variablelist>
+        <para>
+            To use one of the default gadgets, simply drag it from the <emphasis role="bold">Dashboard Workspace</emphasis> onto your Dashboard as illustrated below:
+        </para>
+        <mediaobject>
+            <imageobject role="html">
+                <imagedata fileref="images/Dash2.png" format="PNG" align="center" scale="100"/>
+            </imageobject>
+            <imageobject role="fo">
+                <imagedata fileref="images/Dash2.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/>
+            </imageobject>
+        </mediaobject>
+    </section>
+        
+    <section id="sect-User_Guide-Dashboard_Portlet-Add_Gadgets">
+        <title>Add Gadgets</title>
+            <para>
+                Many more gadgets can be found at <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadgets</ulink>. JBoss Enterprise Portal Platform is compatible with most of the gadgets available there.
+            </para>
+            <mediaobject>
+                <imageobject role="html">
+                    <imagedata fileref="images/GoogleGadgets.png" format="PNG" align="center" scale="100"/>
+                </imageobject>
+                <imageobject role="fo">
+                    <imagedata fileref="images/GoogleGadgets.png" format="PNG" align="center" scalefit="1"  contentwidth="160mm"/>
+                </imageobject>
+            </mediaobject>              
 
-		<para>
-			To add gadgets from external sources:
-		</para>
-		<procedure>
-			<step>
-				<para>
-					Obtain the URL (<emphasis>.xml</emphasis> or <emphasis>.rss</emphasis>) of the gadget you wish to add from the gadget source.
-				</para>				
-				<para>
-					The gadgets available at <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> provide a link to <emphasis role="bold">View source</emphasis>. Clicking on this link will open a page showing the gadget's XML source. Use the URL of this page in the Dashboard Workspace. The URL should end with <literal>.xml</literal>
-				</para>
-				<para>
-					For example:
-				</para>
+        <para>
+            To add gadgets from external sources:
+        </para>
+        <procedure>
+            <step>
+                <para>
+                    Obtain the URL (<emphasis>.xml</emphasis> or <emphasis>.rss</emphasis>) of the gadget you wish to add from the gadget source.
+                </para>             
+                <para>
+                    The gadgets available at <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> provide a link to <emphasis role="bold">View source</emphasis>. Clicking on this link will open a page showing the gadget's XML source. Use the URL of this page in the Dashboard Workspace. The URL should end with <literal>.xml</literal>
+                </para>
+                <para>
+                    For example:
+                </para>
 <programlisting>
 http://www.donalobrien.net/apps/google/currency.xml
 </programlisting>
-				<note>
-					<title>URL Types</title>
-					<para>
-						Remote gadgets can be only created using an .xml link or RSS URL. However, if you use a link that generates an RSS feed (for example: <ulink type="http" url="http://feeds.feedburner.com/gatein">http://feeds.feedburner.com/gatein</ulink>), a new RSS reader gadget will be created automatically even if the URL does not end with <literal>.rss</literal>.
-					</para>
-				</note>
-			</step>
-			<step>
-				<para>
-					Return to your portal and click <emphasis role="bold">Dashboard</emphasis> in the toolbar.
-				</para>
+                <note>
+                    <title>URL Types</title>
+                    <para>
+                        Remote gadgets can be only created using an .xml link or RSS URL. However, if you use a link that generates an RSS feed (for example: <ulink type="http" url="http://feeds.feedburner.com/gatein">http://feeds.feedburner.com/gatein</ulink>), a new RSS reader gadget will be created automatically even if the URL does not end with <literal>.rss</literal>.
+                    </para>
+                </note>
+            </step>
+            <step>
+                <para>
+                    Return to your portal and click <emphasis role="bold">Dashboard</emphasis> in the toolbar.
+                </para>
 <!--
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/DashboardLink.png" format="PNG" align="center" scale="100"/>
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/DashboardLink.png" format="PNG" align="center" scalefit="1"  contentwidth="150mm"/>
-					</imageobject>
-				</mediaobject>
--->				
-			</step>
-			<step>
-				<para>
-					Click on <emphasis role="bold">Add Gadgets</emphasis> in the Dashboard to open the Dashboard Workspace.
-				</para>
-					<mediaobject>
-						<imageobject role="html">
-							<imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scale="100"/>
-						</imageobject>
-						<imageobject role="fo">
-							<imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scalefit="1"  contentwidth="90mm"/>
-						</imageobject>
-					</mediaobject>
-			</step>
-			<step>
-				<para>
-					The Dashboard Workspace dialog appears: 
-					<mediaobject>
-						<imageobject role="html"> 
-							<imagedata fileref="images/EnterLink.png" format="PNG" align="center" scale="100"/>
-						</imageobject>
-						<imageobject role="fo"> 
-							<imagedata fileref="images/EnterLink.png" format="PNG" align="center" scalefit="1"  contentwidth="50mm"/>
-						</imageobject>
-					</mediaobject>
-				</para>
-			</step>
-			<step>
-				<para>
-					Paste the URL obtained in step 1 into the text box above the gadget list.
-				</para>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/CodePaste.png" format="PNG" align="center" scale="100"/>
-					</imageobject>
-					<imageobject role="fo">
-						<imagedata fileref="images/CodePaste.png" format="PNG" align="center" scalefit="1"  contentwidth="100mm" />
-					</imageobject>
-				</mediaobject>
-				
-			</step>
-			<step>
-				<para>
-					Click on the <emphasis role="bold">plus</emphasis> icon to add the new gadget to the page.
-				</para>
-				<para>
-					The new gadget will appear on the Dashboard alongside any other gadgets already in use. If required, the new gadget can be dragged to another position on the page.
-				</para>
-				<para>
-					In the image below, the Currency Converter gadget has been added to the Dashboard, along with some of the default portal gadgets.
-				</para>
-				<mediaobject>
-					<imageobject role="html">
-						<imagedata fileref="images/NewGadget.png" format="PNG" align="center" scale="100"/>
-					</imageobject> 
-					<imageobject role="fo">
-						<imagedata fileref="images/NewGadget.png" format="PNG" align="center" scalefit="1"  contentwidth="150mm"/>
-					</imageobject> 
-				</mediaobject>
-			</step>
-		</procedure>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/DashboardLink.png" format="PNG" align="center" scale="100"/>
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/DashboardLink.png" format="PNG" align="center" scalefit="1"  contentwidth="150mm"/>
+                    </imageobject>
+                </mediaobject>
+-->             
+            </step>
+            <step>
+                <para>
+                    Click on <emphasis role="bold">Add Gadgets</emphasis> in the Dashboard to open the Dashboard Workspace.
+                </para>
+                    <mediaobject>
+                        <imageobject role="html">
+                            <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scale="100"/>
+                        </imageobject>
+                        <imageobject role="fo">
+                            <imagedata fileref="images/Dashboard1.png" format="PNG" align="center" scalefit="1"  contentwidth="90mm"/>
+                        </imageobject>
+                    </mediaobject>
+            </step>
+            <step>
+                <para>
+                    The Dashboard Workspace dialog appears: 
+                    <mediaobject>
+                        <imageobject role="html"> 
+                            <imagedata fileref="images/EnterLink.png" format="PNG" align="center" scale="100"/>
+                        </imageobject>
+                        <imageobject role="fo"> 
+                            <imagedata fileref="images/EnterLink.png" format="PNG" align="center" scalefit="1"  contentwidth="50mm"/>
+                        </imageobject>
+                    </mediaobject>
+                </para>
+            </step>
+            <step>
+                <para>
+                    Paste the URL obtained in step 1 into the text box above the gadget list.
+                </para>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/CodePaste.png" format="PNG" align="center" scale="100"/>
+                    </imageobject>
+                    <imageobject role="fo">
+                        <imagedata fileref="images/CodePaste.png" format="PNG" align="center" scalefit="1"  contentwidth="100mm" />
+                    </imageobject>
+                </mediaobject>
+                
+            </step>
+            <step>
+                <para>
+                    Click on the <emphasis role="bold">plus</emphasis> icon to add the new gadget to the page.
+                </para>
+                <para>
+                    The new gadget will appear on the Dashboard alongside any other gadgets already in use. If required, the new gadget can be dragged to another position on the page.
+                </para>
+                <para>
+                    In the image below, the Currency Converter gadget has been added to the Dashboard, along with some of the default portal gadgets.
+                </para>
+                <mediaobject>
+                    <imageobject role="html">
+                        <imagedata fileref="images/NewGadget.png" format="PNG" align="center" scale="100"/>
+                    </imageobject> 
+                    <imageobject role="fo">
+                        <imagedata fileref="images/NewGadget.png" format="PNG" align="center" scalefit="1"  contentwidth="150mm"/>
+                    </imageobject> 
+                </mediaobject>
+            </step>
+        </procedure>
 
-	</section>
+    </section>
 
 </section>
 

Added: epp/docs/branches/5.1/User_Guide/en-US/modules/terms/Portlet_container_concept.xml
===================================================================
--- epp/docs/branches/5.1/User_Guide/en-US/modules/terms/Portlet_container_concept.xml	                        (rev 0)
+++ epp/docs/branches/5.1/User_Guide/en-US/modules/terms/Portlet_container_concept.xml	2011-08-11 04:41:47 UTC (rev 7044)
@@ -0,0 +1,20 @@
+<?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 "../../User_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="sect-User_Guide-Portlet_Container">
+    <title>Portlet Container</title>
+<!-- Source Metadata
+URL: http://download.oracle.com/docs/cd/B14099_19/core.1012/b13994/glossary.htm#BABGGIFJ
+URL: http://publib.boulder.ibm.com/infocenter/wasinfo/beta/index.jsp?topic=%2Fcom.ibm.websphere.express.doc%2Finfo%2Fexp%2Fae%2Fcport_container.html
+URL: 
+-->
+<!-- Added to satisfy https://bugzilla.redhat.com/show_bug.cgi?id=692170 -->
+        <para>
+            A portlet container supplies the runtime environment in which portlets are started, run and ended. While portlet containers can allow portlets to inherit data from the main portal they also provide an environment in which portlets can be independently managed. APIs dictate both how a portal interacts with portlet containers and how portlet containers interact with individual portlets.
+        </para>
+        <para>
+            
+        </para>
+</section>
\ No newline at end of file

Modified: epp/docs/branches/5.1/User_Guide/publican.cfg
===================================================================
--- epp/docs/branches/5.1/User_Guide/publican.cfg	2011-08-11 04:36:00 UTC (rev 7043)
+++ epp/docs/branches/5.1/User_Guide/publican.cfg	2011-08-11 04:41:47 UTC (rev 7044)
@@ -5,7 +5,7 @@
 type: Book
 brand: JBoss
 debug:1
-show_remarks: 1
+#show_remarks: 1
 cvs_branch: DOCS-RHEL-6
 cvs_root: :ext:cvs.devel.redhat.com:/cvs/dist
 cvs_pkg: JBoss_Enterprise_Portal_Platform-User_Guide-5.1-web-__LANG__
\ No newline at end of file



More information about the gatein-commits mailing list