[gatein-commits] gatein SVN: r1875 - in portal/trunk/docs/user-guide/en/modules: account and 2 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Feb 26 01:45:19 EST 2010


Author: smumford
Date: 2010-02-26 01:45:18 -0500 (Fri, 26 Feb 2010)
New Revision: 1875

Modified:
   portal/trunk/docs/user-guide/en/modules/Introduction.xml
   portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml
   portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml
   portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml
   portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml
   portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml
   portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml
   portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml
   portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml
   portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml
Log:
Edits and todos from Luc

Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Introduction.xml	2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/Introduction.xml	2010-02-26 06:45:18 UTC (rev 1875)
@@ -27,12 +27,23 @@
 					GateIn homepage:
 					<ulink url="http://www.gatein.org">www.gatein.org</ulink>
 				</para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="images/GateIn.png" format="PNG"/>
+					</imageobject>
+				</mediaobject>
 			</listitem>
 			<listitem>
 				<para>
 					GateIn videos:
 					<ulink url="http://www.jboss.org/gatein/videos.html">www.jboss.org/gatein/videos.html</ulink>
 				</para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="images/Videos.png" format="PNG" />
+					</imageobject>
+				</mediaobject>
+
 			</listitem>
 			<listitem>
 				<para>
@@ -45,6 +56,12 @@
 					GateIn downloads:
 					<ulink url="http://www.jboss.org/gatein/downloads.html">www.jboss.org/gatein/downloads.html</ulink>
 				</para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="images/Downloads.png" format="PNG" />
+					</imageobject>
+				</mediaobject>
+
 			</listitem>
 		</itemizedlist>
 	</section>

Modified: portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml	2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml	2010-02-26 06:45:18 UTC (rev 1875)
@@ -6,7 +6,7 @@
 <section id="sect-User_Guide-Register_New_Accounts">
 	<title>Register New Accounts</title>
 	<para>
-		Unregistered users who visit the portal are limited in the content they can see.
+		Unregistered users visiting the portal are limited in the content they can see.
 	</para>
 	<para>
 		Users who need access to deeper content or who need to perform actions within the portal should register themselves and then contact the portal administrator to gain appropriate access permissions to their account.
@@ -19,19 +19,14 @@
 			<para>
 				Click <emphasis role="bold">Register</emphasis> on the Navigation bar.
 			</para>
-<note>
-<title>DOC TODO</title>
-<para>
-please update with latest display + mouse pointer on "Register"
-</para>
-</note>
+
 				<mediaobject>
 					<imageobject>
-						<imagedata fileref="images/Frontpage.png" format="PNG" width="444" />
+						<imagedata fileref="images/Register.png" format="PNG" width="444" />
 					</imageobject>
 				</mediaobject>
 				<para>
-					The Register page appears: 
+					The <emphasis role="bold">Register New Account</emphasis> page appears: 
 				</para>
 				<mediaobject>
 					<imageobject>
@@ -40,12 +35,12 @@
 				</mediaobject>
 
 			<para>
-				The <emphasis role="bold">Account Setting</emphasis> information includes:
+				The required information includes:
 			</para>
 
 					<variablelist>
 						<varlistentry>
-							<term>User Name</term> 
+							<term><emphasis role="bold">User Name</emphasis></term> 
 							<listitem>
 								<para>
 									The name used to log in.
@@ -53,7 +48,7 @@
 							</listitem>
 						</varlistentry>
 						<varlistentry>
-							<term>Password</term>
+							<term><emphasis role="bold">Password</emphasis></term>
 							<listitem>
 								<para>
 									The password must be between 6 and 30 characters and can contain spaces.
@@ -61,7 +56,7 @@
 							</listitem>
 						</varlistentry>
 						<varlistentry>
-							<term>Confirm Password</term>
+							<term><emphasis role="bold">Confirm Password</emphasis></term>
 							<listitem>
 								<para>
 									Re-type the password above. The <emphasis>Password</emphasis> and <emphasis>Confirm Password</emphasis> fields must be the same.
@@ -69,7 +64,7 @@
 							</listitem>
 						</varlistentry>
 						<varlistentry>
-							<term>First Name</term>
+							<term><emphasis role="bold">First Name</emphasis></term>
 							<listitem>
 								<para>
 									The user's first name.
@@ -77,7 +72,7 @@
 							</listitem>
 						</varlistentry>
 						<varlistentry>
-							<term>Last Name</term>
+							<term><emphasis role="bold">Last Name</emphasis></term>
 							<listitem>
 								<para>
 									The user's last name.
@@ -85,7 +80,7 @@
 							</listitem>
 						</varlistentry>
 						<varlistentry>
-							<term>Email Address</term>
+							<term><emphasis role="bold">Email Address</emphasis></term>
 							<listitem>
 								<para>
 									The user's email address. This must be in the appropriate format. For example: <replaceable>username at abc.com</replaceable>.
@@ -119,7 +114,7 @@
 		</step> -->
 		<step>
 			<para>
-				Click <emphasis role="bold">Subscribe</emphasis> to register a new account or <emphasis role="bold">Reset</emphasis> to refresh all entered values. You cannot add a new account if one of these cases occurs:
+				Click <emphasis role="bold">Subscribe</emphasis> to register a new account or <emphasis role="bold">Reset</emphasis> to refresh all entered values. You cannot add a new account if one of the following cases occurs:
 			</para>
 			<itemizedlist>
 				<listitem>

Modified: portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml	2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml	2010-02-26 06:45:18 UTC (rev 1875)
@@ -6,11 +6,11 @@
 <section id="sect-User_Guide-Remember_User_Account">
 	<title>Remember User Account</title>
 	<para>
-		Users who return to &PRODUCT; can be automatically authenticated thanks to a cookie set the first time they've logged in. Users do not have to perform an explicit authentication each time they access the portal.
+		Users who return to &PRODUCT; regularly can be automatically authenticated to avoid performing an explicit authentication each time they access the portal.
 	</para>
 	<mediaobject>
 		<imageobject>
-			<imagedata fileref="images/RememberMe2.6.png" format="PNG" width="444" />
+			<imagedata fileref="images/RememberMe.png" format="PNG" width="444" />
 		</imageobject>
 	</mediaobject>
 	<procedure>
@@ -31,7 +31,7 @@
 		</step>
 	</procedure>
 	<para>
-		You must remember to close your browser without signing out (as signing out will delete the cookie).
+		Do not sign out when you leave the portal and you will be automatically authenticated next time you visit it.
 	</para>
 
 </section>

Modified: portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml	2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml	2010-02-26 06:45:18 UTC (rev 1875)
@@ -15,7 +15,7 @@
 		<variablelist>
 			<varlistentry>
 				<term>
-					User name
+					<emphasis role="bold">User name</emphasis>
 				</term>
 				<listitem>
 					<para>
@@ -25,7 +25,7 @@
 			</varlistentry>
 			<varlistentry>
 				<term>
-					Password
+					<emphasis role="bold">Password</emphasis>
 				</term>
 				<listitem>
 					<para>
@@ -35,7 +35,7 @@
 			</varlistentry>
 			<varlistentry>
 				<term>
-					Remember My Login
+					<emphasis role="bold">Remember My Login</emphasis>
 				</term>
 				<listitem>	
 					<para>
@@ -45,7 +45,7 @@
 			</varlistentry>
 			<varlistentry>
 				<term>
-					Forgot your User Name/Password?
+					<emphasis role="bold">Forgot your User Name/Password?</emphasis>
 				</term>
 				<listitem>
 					<para>
@@ -55,7 +55,7 @@
 			</varlistentry>
 			<varlistentry>
 				<term>
-					Sign in
+					<emphasis role="bold">Sign in</emphasis>
 				</term>
 				<listitem>
 					<para>
@@ -65,7 +65,7 @@
 			</varlistentry>
 			<varlistentry>
 				<term>
-					Discard
+					<emphasis role="bold">Discard</emphasis>
 				</term>
 				<listitem>
 					<para>
@@ -89,7 +89,7 @@
 					</para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/SignIn2.6.png" format="PNG" width="444" />
+							<imagedata fileref="images/Signin.png" format="PNG" width="444" />
 						</imageobject>
 					</mediaobject>
 					</step>
@@ -115,34 +115,37 @@
 			<para>
 				After signing in, you will be redirected to the homepage and welcomed with your full name in the top right corner of the page.
 			</para>
-<!--
 			<mediaobject>
 				<imageobject>
-					<imagedata fileref="images/PortalHome.png" format="PNG" width="444" />
+					<imagedata fileref="images/Toolbar.png" format="PNG" width="444" />
 				</imageobject>
 			</mediaobject>
--->
+
                      </section>
 
                      <section id="sect-User_Guide-Sign_Out">
 		        <title>Sign Out</title>
-			<procedure>
+				<para>
+					This feature ends the authenticated session and returns the user to the anonymous portal.
+				</para>
+				<procedure>
 					<step>
 						<para>
-							This feature lets you get back to the anonymous portal. It ends your current portal session.
+							In the upper left corner of the screen, hover your cursor over the &PRODUCT; icon. A drop down menu will appear.
 						</para>
 					</step>
 					<step>
 						<para>
-							In the upper left corner of the screen, click <emphasis role="bold">Sign out</emphasis> :
+							Click <emphasis role="bold">Sign out</emphasis> :
 						</para>
-						<mediaobject>
-							<imageobject>
-								<imagedata fileref="images/SignOut.png" format="PNG" />
-							</imageobject>
-						</mediaobject>
 					</step>
-			</procedure>
+				</procedure>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="images/StarPortlet.png" format="PNG" />
+						</imageobject>
+					</mediaobject>
+
                      </section>
 
 </section>

Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml	2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml	2010-02-26 06:45:18 UTC (rev 1875)
@@ -13,7 +13,7 @@
 	</para>
 	<mediaobject>
 		<imageobject>
-			<imagedata fileref="images/Dashboard1.png" format="PNG" width="444" />
+			<imagedata fileref="images/Dashboard1.png" format="PNG"   />
 		</imageobject>
 	</mediaobject>
 
@@ -33,11 +33,11 @@
 			
 		</procedure>
 		<para>
-			The active Dashboard can be individually named by clicking on the default name ("<emphasis>Click and Type Page Name</emphasis>") where it appears below the current user name and entering a new name.
+			The active Dashboard can be individually named by clicking on the default name ("<emphasis>Click and Type Page Name</emphasis>") and entering a new name.
 		</para>
 		<mediaobject>
 			<imageobject>
-				<imagedata fileref="images/Dashname.png" format="PNG" width="444" />
+				<imagedata fileref="images/Dashname.png" format="PNG"   />
 			</imageobject>
 		</mediaobject>
 
@@ -46,52 +46,52 @@
 		</para>
 		<mediaobject>
 			<imageobject>
-				<imagedata fileref="images/Dash2.png" format="PNG" width="444" />
+				<imagedata fileref="images/Dash2.png" format="PNG"   />
 			</imageobject>
 		</mediaobject>
 		<variablelist id="vari-User_Guide-Using_the_Dashboard_Workspace-Default_Gadgets">
 			<title>Default Gadgets:</title>
 			<varlistentry>
-				<term>Calendar</term>
+				<term><emphasis role="bold">Calendar</emphasis></term>
 				<listitem>
 					<para>
 						The calendar gadget allows users to switch easily between daily, monthly and yearly view and, is customizable to match your portal's theme.
 					</para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/Calendar.png" format="PNG" />
+							<imagedata fileref="images/Calendar.png" format="PNG" width="444" />
 						</imageobject>
 					</mediaobject>
 				</listitem>
 			</varlistentry>
 			<varlistentry>
-				<term>ToDo</term>
+				<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. Tasks can be highlighted with different colors.
 					</para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/Todo.png" format="PNG" />
+							<imagedata fileref="images/Todo.png" format="PNG"   />
 						</imageobject>
 					</mediaobject>
 				</listitem>
 			</varlistentry>
 			<varlistentry>
-				<term>Calculator</term>
+				<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>
-							<imagedata fileref="images/Calculator.png" format="PNG" />
+							<imagedata fileref="images/Calculator.png" format="PNG"   />
 						</imageobject>
 					</mediaobject>
 				</listitem>
 			</varlistentry>
 			<varlistentry>
-				<term>RSS Reader</term>
+				<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.
@@ -104,11 +104,16 @@
 				</listitem>
 			</varlistentry>
 			<varlistentry>
-				<term>More Gadgets</term>
+				<term><emphasis role="bold">More Gadgets</emphasis></term>
 				<listitem>
 					<para>
 						Many more gadgets can be found at <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink>. &PRODUCT; is compatible with most of the gadgets available there.
 					</para>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="images/GoogleGadgets.png" format="PNG" />
+						</imageobject>
+					</mediaobject>				
 				</listitem>
 			</varlistentry>
 		</variablelist>
@@ -116,13 +121,6 @@
 		
 	<section id="sect-User_Guide-Dashboard_Portlet-Add_Gadgets">
 		<title>Add Gadgets</title>
-
-<note>
-<title>DOC TODO</title>
-<para>
-please redo this section wich screenshots to demonstrate the addition of an external gadget provided by Google
-</para>
-</note>
 		<para>
 			To add more gadgets from external sources:
 		</para>
@@ -130,10 +128,18 @@
 			<step>
 				<para>
 					Obtain the URL (.xml or .rss) 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; 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 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>
+					For example:
 				</para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="images/XMLURL.png" format="PNG" width="444" />
+					</imageobject>
+				</mediaobject>
 				<note>
 					<title>URL Types</title>
 					<para>
@@ -145,6 +151,12 @@
 				<para>
 					Return to your portal and click the Dashboard link in the toolbar.
 				</para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="images/DashboardLink.png" format="PNG" />
+					</imageobject>
+				</mediaobject>
+				
 			</step>
 			<step>
 				<para>
@@ -152,10 +164,9 @@
 				</para>
 					<mediaobject>
 						<imageobject>
-							<imagedata fileref="images/Dashboard1.png" format="PNG" width="444" />
+							<imagedata fileref="images/Dashboard1.png" format="PNG" />
 						</imageobject>
 					</mediaobject>
-
 			</step>
 			<step>
 				<para>
@@ -171,11 +182,23 @@
 				<para>
 					Paste the URL obtained in step 1 into the text box above the gadget list.
 				</para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="images/CodePaste.png" format="PNG" />
+					</imageobject>
+				</mediaobject>
+				
 			</step>
 			<step>
 				<para>
 					Click on the <emphasis role="bold">plus</emphasis> icon to add the new gadget to the page.
 				</para>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="images/NewGadget.png" format="PNG" />
+					</imageobject>
+				</mediaobject>
+				
 			</step>
 		</procedure>
 

Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml	2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml	2010-02-26 06:45:18 UTC (rev 1875)
@@ -45,13 +45,6 @@
 			<para>
 				The Application Registry  Portlet is used to manage different application categories. You can add, edit, set permissions and delete a category and its applications.
 			</para>
-
-<note>
-<title>DOC TODO</title>
-<para>
-please redo screenshot, it is not up-to-date
-</para>
-</note>
 			<mediaobject>
 				<imageobject>
 					<imagedata fileref="images/ApplicationRegistry.png" format="PNG" width="444" />
@@ -90,7 +83,7 @@
 	</varlistentry>
     -->
 	<varlistentry>
-		<term>Star Toolbar Portlet</term>
+		<term><emphasis role="bold">Star Toolbar Portlet</emphasis></term>
 		<listitem>
 			<para>
 				The Star Toolbar Portlet is used to change the default language, the skin of the portal or to sign out.

Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml	2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml	2010-02-26 06:45:18 UTC (rev 1875)
@@ -11,68 +11,68 @@
 
 	<variablelist>
 	  <varlistentry>
-		<term>Banner Portlet</term>
+		<term><emphasis role="bold">Banner Portlet</emphasis></term>
 		<listitem>
-			<para>
-				This Portlet contains the organization's slogan, logo, and icons.
-			</para>
-		<!--    <mediaobject>
+			<mediaobject>
 				<imageobject>
 					<imagedata fileref="images/BannerPortlet.png" format="PNG"></imagedata>
 				</imageobject>
-			</mediaobject>	          -->
+			</mediaobject>
+			<para>
+				This Portlet contains the organization's slogan, logo, and icons.
+			</para>
 		</listitem>
 	</varlistentry>
 	<varlistentry>
-		<term>HomePage Portlet</term>
+		<term><emphasis role="bold">HomePage Portlet</emphasis></term>
 		<listitem>
 			<para>
 				This Portlet is the home page for a portal. The home page is the first page displayed when you visit the site.
 			</para>
-		<!--    <mediaobject>
+			<mediaobject>
 				<imageobject>
-					<imagedata fileref="images/PortletHome2.png" format="PNG"></imagedata>
+					<imagedata fileref="images/PortalHome.png" format="PNG"></imagedata>
 				</imageobject>
-			</mediaobject>          -->
+			</mediaobject>
 		</listitem>
 	</varlistentry>
 	<varlistentry>
-		<term>Navigation Portlet</term>
+		<term><emphasis role="bold">Navigation Portlet</emphasis></term>
 		<listitem>
 			<para>
 				This Portlet provides a navigation bar. A navigation bar is a menu that helps users to visualize the structure of a site and provide links to quickly move from page to page.
 			</para>
-		<!--    <mediaobject>
+			<mediaobject>
 				<imageobject>
 					<imagedata fileref="images/NavigationPortlet.png" format="PNG"></imagedata>
 				</imageobject>
-			</mediaobject> -->
+			</mediaobject>
 		</listitem>
 	</varlistentry>
 	<varlistentry>
-		<term>Sitemap Portlet</term>
+		<term><emphasis role="bold">Sitemap Portlet</emphasis></term>
 		<listitem>
 			<para>
 				This Portlet displays a site map page of a web site. It lists pages on a website, typically organized in hierarchical fashion.
 			</para>
-		<!--    <mediaobject>
+			<mediaobject>
 				<imageobject>
-					<imagedata fileref="images/SiteMap3.png" format="PNG"></imagedata>
+					<imagedata fileref="images/SiteMap.png" format="PNG"></imagedata>
 				</imageobject>
-			</mediaobject>         -->
+			</mediaobject>
 		</listitem>
 	</varlistentry>
 	<varlistentry>
-		<term>Breadcumbs Portlet</term>
+		<term><emphasis role="bold">Breadcumbs Portlet</emphasis></term>
 		<listitem>
 			<para>
 				This Portlet displays the 'path' the user has taken from the home page to arrive at the currrent page.
 			</para>
-		<!--    <mediaobject>
+			<mediaobject>
 				<imageobject>
-					<imagedata fileref="images/Breadcumbs.png" format="PNG"></imagedata>
+					<imagedata fileref="images/Breadcrumbs.png" format="PNG"></imagedata>
 				</imageobject>
-			</mediaobject>          -->
+			</mediaobject>
 		</listitem>
 	</varlistentry>
 <!--  	<varlistentry>
@@ -89,25 +89,23 @@
 		</listitem>
 	</varlistentry> -->
 	<varlistentry>
-		<term>Dashboard Portlet</term>
+		<term><emphasis role="bold">Dashboard Portlet</emphasis></term>
 		<listitem>
 			<para>
 				This portlet is used for hosting mini-applications known as gadgets. The dashboard uses a variety of graphical effects for displaying, opening, and using gadgets.
 			</para>
-<!--
 			<mediaobject>
 				<imageobject>
-					<imagedata fileref="images/Dashboard1.png" format="PNG" width="444" />
+					<imagedata fileref="images/Dashboard.png" format="PNG" width="444" />
 				</imageobject>
 			</mediaobject>
--->
 			<para>
 				Refer to <xref linkend="sect-User_Guide-Dashboard_Portlet" /> or <xref linkend="chap-User_Guide-Gadgets_Administration" /> for more information.
 			</para>
 		</listitem>
 	</varlistentry>
 	<varlistentry>
-		<term>Iframe Portlet</term>
+		<term><emphasis role="bold">Iframe Portlet</emphasis></term>
 		<listitem>
 			<para>
 				This Portlet is used to create inline frames (IFrame) elements for a site. An Iframe is a HTML element which can embed another document into a parent HTML document. By using IFrames, embedded data is displayed inside a sub-window of browser.
@@ -135,7 +133,7 @@
 	</varlistentry>
     -->
 	<varlistentry>
-		<term>Gadget Wrapper Portlet</term>
+		<term><emphasis role="bold">Gadget Wrapper Portlet</emphasis></term>
 		<listitem>
 			<para>
 				This Portlet allows users to view a gadget in canvas mode. 
@@ -163,16 +161,16 @@
 	</varlistentry>
     -->
 	<varlistentry>
-		<term>Footer Portlet</term>
+		<term><emphasis role="bold">Footer Portlet</emphasis></term>
 		<listitem>
 			<para>
 				This Portlet provides the footer for a site. This footer provides information or links about the site's author/institutional sponsor, the date of the last revision made to the site, copyright information, comments form and navigational links.
 			</para>
-		<!--    <mediaobject>
+			<mediaobject>
 				<imageobject>
 					<imagedata fileref="images/Footer.png" format="PNG"></imagedata>
 				</imageobject>
-			</mediaobject>       -->
+			</mediaobject>
 		</listitem>
 	</varlistentry>
 	</variablelist>

Modified: portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml	2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml	2010-02-26 06:45:18 UTC (rev 1875)
@@ -6,8 +6,14 @@
 <section id="sect-User_Guide-Portal">
 	<title>Portal</title>
 		<para>
-An enterprise portal is a Web application that provides means to aggregate and personalize information via application-specific portlets. The users and administrators are able via a web-based user interface to integrate information, people and processes across organizational boundaries. The framework enables aggregation of enterprise content and business applications with flexible management and personalization options.
+An enterprise portal is a Web application that provides means to aggregate and personalize information via application-specific portlets.
 		</para>
+		<para>
+			Users and administrators are able to integrate information, people and processes across organizational boundaries via a web-based user interface.
+		</para>
+		<para>
+			The framework enables aggregation of enterprise content and business applications with flexible management and personalization options.
+		</para>
 </section>
 
 

Modified: portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml	2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml	2010-02-26 06:45:18 UTC (rev 1875)
@@ -10,7 +10,7 @@
 	</para>
 	<variablelist>
 	  <varlistentry>
-		<term>Public</term>
+		<term><emphasis role="bold">Public</emphasis></term>
 		<listitem>
 			<para>
 				This mode is for guest users who are not registered with the Portal. It does not require a log in and restricts the visitor to the public pages in the portal. Visitors can register an account to gain access to the restricted pages. After being registered, they can use the Private mode but must still contact the Portal administrator to get more rights or a group manager to become a member and gain access a group.
@@ -18,7 +18,7 @@
 		</listitem>
 	</varlistentry>
 	<varlistentry>
-		<term>Private</term>
+		<term><emphasis role="bold">Private</emphasis></term>
 		<listitem>
 			<para>
 				This mode is for registered users only. Users set a username and password during registration which they can then use to sign in. This mode offers users more site privileges. Registered users can manage private resources (creating, editing or deleting private pages), "borrow" pages from other users by creating hyperlinks and change the language for individual needs.

Modified: portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml	2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml	2010-02-26 06:45:18 UTC (rev 1875)
@@ -6,7 +6,7 @@
 <section id="sect-User_Guide-Toolbar-Concept">
 	<title>Toolbar</title>
 	<para>
-	The Toolbar spans the top of the portal application and provides links to user and administrative actions. 
+		The Toolbar spans the top of the portal application and provides links to user and administrative actions. 
         </para>
 	<mediaobject>
 		<imageobject>



More information about the gatein-commits mailing list