Author: smumford Date: 2010-02-18 18:20:47 -0500 (Thu, 18 Feb 2010) New Revision: 1775 Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.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/portal/Toolbar.xml portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml portal/trunk/docs/user-guide/en/modules/terms/Portlet_concept.xml portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml Log: minor edits Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/Introduction.xml 2010-02-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/Introduction.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -17,7 +17,7 @@ This book explains various apsects of &PRODUCT;, such as managing users and access permissions, using portlets and changing simple interface features such as skins, langauage and page orientation. </para> <para> - Refer to the <ulink type="http" url="http://redhat.com/docs">&PRODUCT; Installation Guide</ulink> for information on downloading and installing the product or see the <ulink type="http" url="http://redhat.com/docs">&PRODUCT; Reference Guide</ulink> for information on more advances topics. + Refer to the <ulink type="http" url="http://redhat.com/docs">&PRODUCT; Installation Guide</ulink> for information on downloading and installing the product or the <ulink type="http" url="http://redhat.com/docs">&PRODUCT; Reference Guide</ulink> for information on more advanced topics. </para> <section id="sect-Install_Guide-Introduction-Related_Links"> <title>Related Links</title> Modified: portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml 2010-02-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -45,12 +45,12 @@ <itemizedlist> <listitem> <para> - <emphasis role="bold">Forgot my password</emphasis>. If you forget your password, you need to select this option. + <emphasis role="bold">Forgot my password</emphasis>. </para> </listitem> <listitem> <para> - <emphasis role="bold">Forgot my username</emphasis>. If you forget your username, you need to select this option. + <emphasis role="bold">Forgot my username</emphasis>. </para> </listitem> </itemizedlist> Modified: portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml 2010-02-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -26,9 +26,6 @@ --><title>Change Account Settings</title> <para> - Users can follow this guide to change account information. - </para> - <para> To change your account information, click on the account name in the top navigation bar: </para> <mediaobject> 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-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -25,9 +25,12 @@ --><title>Register New Accounts</title> <para> - Users who visit the Portal and who are not registered are limited in the content they can see. Users who need access to deeper content or who need to undertake actions within the prtal should register themselves and then contact the portal administrator to have appropriate permissions added to their account. + Unregistered users who visit the portal are limited in the content they can see. </para> <para> + Users who need access to deeper content or who need to undertake actions within the portal should register themselves and then contact the portal administrator to have appropriate permissions added to their account. + </para> + <para> Users can quickly and easily register a new account for themselves. Complete the steps below: </para> <procedure> @@ -58,7 +61,7 @@ <term>User Name</term> <listitem> <para> - The name used to login. + The name used to log in. </para> </listitem> </varlistentry> @@ -98,7 +101,7 @@ <term>Email Address</term> <listitem> <para> - The user's email address. This must be in the appropriate format. For example: username(a)abc.com. + The user's email address. This must be in the appropriate format. For example: <replaceable&gt;username(a)abc.com&lt;/replaceable&gt;. </para> </listitem> </varlistentry> @@ -165,7 +168,7 @@ <note> <title>Note</title> <para> - Be sure you enter your email address carefully. If you should forget your user name or password, you can recover it with this email address. + Be sure you enter your email address carefully. If you should forget your user name or password, you can recover it from this email address. </para> </note> </para> 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-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -25,7 +25,7 @@ --><title>Remember User Account</title> <para> - Users can return to the &PRODUCT; and be automatically authenticated with a cookie provided by their browser. Thus users do not have to perform an explicit authentication each time they access the portal. + Users can return to the &PRODUCT; and be automatically authenticated with a cookie provided by their browser. This means users do not have to perform an explicit authentication each time they access the portal. </para> <mediaobject> <imageobject> 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-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -97,7 +97,7 @@ <title>Sign In</title> <step> <para> - Go to your Portal by entering the URL into the address bar of your browser (For example http://localhost:8080/portal). + Go to your portal by entering the URL into the address bar of your browser (For example http://localhost:8080/portal). </para> </step> <step> @@ -127,7 +127,7 @@ </step> </procedure> <para> - If the user name does not exist or the user name and/or password is invalid an alert message will appear. To attempt the login again; click the <emphasis role="bold">OK</emphasis> button on the alert message to be returned to the Sign In form. Enter the user name and password again. + If the user name does not exist or the user name and/or password is invalid an alert message will appear. To attempt the log in again; click the <emphasis role="bold">OK</emphasis> button on the alert message to be returned to the Sign In form. Enter the user name and password again. </para> <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. Modified: portal/trunk/docs/user-guide/en/modules/portal/Toolbar.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/Toolbar.xml 2010-02-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/portal/Toolbar.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -21,7 +21,7 @@ <term>User Menu</term> <listitem> <para> - You can use the user menu to change the language or skin used in the portal or to sign out. + You can use the main menu (located under the product icon) to change the language or skin used in the portal or to sign out. </para> <mediaobject> <imageobject> @@ -79,7 +79,7 @@ <term> Editor</term> <listitem> <para> - Portal Administrators have access to another navigation that offers links to add a new page to the current portal, edit a particular page's properties or to change a page's layout. This navigation appears next to the Dashboard navigation in the Toolbar and is contextually-named. It will appear as either <emphasis role="bold">Site Editor</emphasis> or <emphasis role="bold">Group Editor</emphasis> depending on the user's location within the portal. + Portal Administrators have access to another navigation that allows them to; add a new page to the current portal, edit a particular page's properties or to change a page's layout. This navigation appears next to the Dashboard navigation in the Toolbar and is contextually-named. It will appear as either <emphasis role="bold">Site Editor</emphasis> or <emphasis role="bold">Group Editor</emphasis> depending on the user's location within the portal. </para> <mediaobject> <imageobject> Modified: portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml 2010-02-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/portal/User_Management.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -6,7 +6,7 @@ <section id="sect-User_Guide-User_management"> <title>User management</title> <para> - To assist Administrators to manage a number of registered users &PRODUCT; offers a number of tools to manage users, groups and memberships easily and effectively. + &PRODUCT; offers a number of tools to assist Administrators to manage a number of registered users, groups and memberships easily and effectively. </para> <section id="sect-User_Guide-User_Management-Manage_users"> 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-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -6,8 +6,11 @@ <section id="sect-User_Guide-Dashboard_Portlet"> <title>Dashboard Portlet</title> <para> - The Dashboard portlet is used for hosting mini applications known as gadgets. The Dashboard uses a variety of graphical effects for displaying, opening and using gadgets. Gadgets can be moved, rearranged, created and 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 as independent as different portlets instances. + The Dashboard 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> + <para> + Gadgets within the Dashboard portlet 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> <mediaobject> <imageobject> <imagedata fileref="images/Dashboard1.png" format="PNG" width="444" /> @@ -128,7 +131,7 @@ <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: http://feeds.feedburner.com/gatein), a new RSS reader gadget will be created automatically. + 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.feedbu...>), a new RSS reader gadget will be created automatically even if the URL does not end in <literal>.rss</literal>. </para> </note> </step> 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-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -14,7 +14,7 @@ <term>Banner Portlet</term> <listitem> <para> - This Portlet is considered the welcome gateway of a Portal. It contains the organization's slogan, logo, and icons etc. + This Portlet contains the organization's slogan, logo, and icons. </para> <!-- <mediaobject> <imageobject> @@ -27,7 +27,7 @@ <term>HomePage Portlet</term> <listitem> <para> - This Portlet is used to provide the home page for a portal. The home page is the first page displayed when you visit the site. + This Portlet is the home page for a portal. The home page is the first page displayed when you visit the site. </para> <!-- <mediaobject> <imageobject> @@ -40,7 +40,7 @@ <term>Navigation Portlet</term> <listitem> <para> - This Portlet provides a navigation bar. A is a menu that helps users to visualize the structure of a site and provide links to quickly move from page to page. + This Portlet provides a navigation bar. A navigation 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> <imageobject> Modified: portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml 2010-02-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -8,7 +8,6 @@ <para> A gadget is a mini web application that a portal user can add to their web page. Some useful gadgets that are packaged by default with &PRODUCT;: </para> - <para> See the <emphasis role="bold">Default Gadgets</emphasis> section of <xref linkend="sect-User_Guide-Dashboard_Portlet-Using_the_Dashboard_Workspace" /> for more information about these gadgets. </para> Modified: portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml 2010-02-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -6,7 +6,7 @@ <section id="sect-User_Guide-Navigation"> <title>Navigation</title> <para> - Portal navigations are menus that list hyperlinks to other parts of a Portal. They can help users to visualize the structure of a site. The default navigation menus in &PRODUCT; are located in a bar across the top of the 'Home' page. + Portal navigations are menus that contain hyperlinks to other parts of a Portal. They can help users to visualize the structure of a site. The default navigation menus in &PRODUCT; are located in the Toolbar (<xref linkend="sect-User_Guide-Toolbar-Concept"/>). </para> <para> There are three navigation types. @@ -16,23 +16,43 @@ <term>Site</term> <listitem> <para> - This navigation links to separate sites of the main Portal. Each site has only one navigation and it is automatically created when the site is created. This functionality allows different sites to administer some Portal aspects individually, such as portlets, while maintaining other content standardized with the parent Portal. + This navigation links to separate sites of the parent Portal. Each site has only one navigation and it is automatically generated when the site is created. </para> + <para> + This functionality allows different sites to administer some Portal aspects (such as portlets) individually while maintaining other content standardized with the parent Portal. + </para> </listitem> </varlistentry> <varlistentry> <term>Group</term> <listitem> <para> - The content of this navigation differs depending on the type of account logged in. For user accounts the Groups navigation holds personal links set up by the user. For management accounts, it keeps the links to pages for registered Portal users as well as administrative tasks and personal links. In the administrator account, the navigation adds further management abilities such as Internationalization and community management. + The content of this navigation differs depending on the type of account logged in. </para> + <itemizedlist> + <listitem> + <para> + If a user account in in effect, this navigation holds personal links set up by that user. + </para> + </listitem> + <listitem> + <para> + When using a management account, this navigation contains links to pages for registered users as well as administrative tasks and personal links. + </para> + </listitem> + <listitem> + <para> + In an administrator account the navigation adds further management abilities such as Internationalization and community management. + </para> + </listitem> + </itemizedlist> </listitem> </varlistentry> <varlistentry> <term>Dashboard</term> <listitem> <para> - Each user has own navigation 'Dashboard' that houses links and portlets (or gadgets) that the user has selected. A user's navigation is created automatically when user is registered. This navigation only can be deleted when the user is deleted. + Each user has own navigation 'Dashboard' that contains links and portlets (or gadgets) that the user has selected. A user's navigation is created automatically when user is registered. This navigation only can be deleted when the user is deleted. </para> </listitem> </varlistentry> @@ -45,9 +65,12 @@ <term>Site/Group Editor</term> <listitem> <para> - This navigation appears as either <emphasis role="bold">Site Editor</emphasis> or <emphasis role="bold">Group Editor</emphasis> depending on the administrator's location within the portal. When in areas of the portal displaying content, the navigation shows as <emphasis role="bold">Site Editor</emphasis> and in areas of the portal pertaining to users, the navigation shows as <emphasis role="bold">Group Editor</emphasis>. + This navigation appears as either <emphasis role="bold">Site Editor</emphasis> or <emphasis role="bold">Group Editor</emphasis> depending on the administrator's location within the portal. </para> <para> + When in areas of the portal displaying content, the navigation shows as <emphasis role="bold">Site Editor</emphasis> and in areas of the portal pertaining to users, the navigation shows as <emphasis role="bold">Group Editor</emphasis>. + </para> + <para> This navigation contains links to add a new pages to the portal, to edit a page or to change the portal's layout. Administrators can use these links to manage the portal. </para> </listitem> 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-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -6,7 +6,7 @@ <section id="sect-User_Guide-Portal"> <title>Portal</title> <para> - &PRODUCT; is a web-based application that provides users with personalized User Interface (UI). This interface allows users to easily search applications or information or communicating with other users. + &PRODUCT; is a web-based application that provides users with a personalized User Interface (UI). This interface allows users to easily search applications and information or communicate with other users. </para> <para> The Portal provides a graphical aggregation of enterprise content and business applications with flexible management and personalization options. Modified: portal/trunk/docs/user-guide/en/modules/terms/Portlet_concept.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/terms/Portlet_concept.xml 2010-02-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/terms/Portlet_concept.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -6,10 +6,10 @@ <section id="sect-User_Guide-Portlet"> <title>Portlet</title> <para> - A portlet is a small, self-contained web application. Portlet interface components are managed and displayed within a Portal. Typically, a <emphasis>portal</emphasis> page is displayed as a collection of non-overlapping <emphasis>portlet</emphasis> windows, with each portlet window displaying a different portlet. Hence a portlet (or collection of portlets) resembles a web-based application hosted in a portal. + A portlet is a small, self-contained web application. Portlets are managed and displayed within a Portal. Typically, a <emphasis>portal</emphasis> page is displayed as a collection of non-overlapping <emphasis>portlet</emphasis> windows, with each portlet window displaying a different portlet. Hence a portlet (or collection of portlets) resembles a web-based application hosted in a portal. </para> <para> - Portlets can be configured to generated differing content and &PRODUCT; has a number of default portlets that can be plugged into any portal. + Portlets can be configured to generated differing content and &PRODUCT; has a number of default portlets that can be used in any portal built in the application. </para> </section> 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-18 22:06:39 UTC (rev 1774) +++ portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2010-02-18 23:20:47 UTC (rev 1775) @@ -6,8 +6,11 @@ <section id="sect-User_Guide-Toolbar-Concept"> <title>Toolbar</title> <para> - This bar contains all user and administration actions. It helps users and the administrator access and perform actions easily, quickly and effectively. You can see the toolbar below as it appears in the Portal: + The Toolbar spans the top of the portal application and contains links to user and administrative actions. It helps users and the administrator access and perform actions easily, quickly and effectively. </para> + <para> + You can see the toolbar below as it appears in the Portal: + </para> <mediaobject> <imageobject> <imagedata fileref="images/Toolbar.png" format="PNG" width="444" />