Author: smumford Date: 2011-04-20 02:35:00 -0400 (Wed, 20 Apr 2011) New Revision: 6296 Modified: epp/docs/branches/5.0/Installation_Guide/en-US/DatabaseConfiguration.xml epp/docs/branches/5.0/Installation_Guide/en-US/Getting_Started.xml epp/docs/branches/5.0/Installation_Guide/en-US/Launching.xml epp/docs/branches/5.0/Installation_Guide/en-US/fallback_content/Conventions.xml epp/docs/branches/5.0/Reference_Guide/en-US/Common_Content/Conventions.xml epp/docs/branches/5.0/Reference_Guide/en-US/Feedback.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/Foundations.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/configuration.bk epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/Introduction.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml epp/docs/branches/5.0/Release_Notes/en-US/Common_Content/Conventions.xml epp/docs/branches/5.0/Site_Publisher_Technical_Preview_Release_Notes/en-US/Introduction.xml epp/docs/branches/5.0/User_Guide/en-US/Common_Content/Conventions.xml epp/docs/branches/5.1/Installation_Guide/en-US/DatabaseConfiguration.xml epp/docs/branches/5.1/Installation_Guide/en-US/Getting_Started.xml epp/docs/branches/5.1/Installation_Guide/en-US/Launching.xml epp/docs/branches/5.1/Installation_Guide/en-US/fallback_content/Conventions.xml epp/docs/branches/5.1/Reference_Guide/en-US/Common_Content/Conventions.xml epp/docs/branches/5.1/Reference_Guide/en-US/Feedback.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/Foundations.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/LDAP.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/Introduction.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml epp/docs/branches/5.1/Release_Notes/en-US/Common_Content/Conventions.xml epp/docs/branches/5.1/User_Guide/en-US/Common_Content/Conventions.xml epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml epp/docs/branches/5.2/Installation_Guide/en-US/Getting_Started.xml epp/docs/branches/5.2/Installation_Guide/en-US/Launching.xml epp/docs/branches/5.2/Installation_Guide/en-US/fallback_content/Conventions.xml epp/docs/branches/5.2/Reference_Guide/en-US/Common_Content/Conventions.xml epp/docs/branches/5.2/Reference_Guide/en-US/Feedback.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/Foundations.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/Introduction.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml epp/docs/branches/5.2/Release_Notes/en-US/Common_Content/Conventions.xml epp/docs/branches/5.2/User_Guide/en-US/Common_Content/Conventions.xml Log: Removed &#39; (Apostrophe entities) to enable spellchecking for contractions Modified: epp/docs/branches/5.0/Installation_Guide/en-US/DatabaseConfiguration.xml =================================================================== --- epp/docs/branches/5.0/Installation_Guide/en-US/DatabaseConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Installation_Guide/en-US/DatabaseConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -154,7 +154,7 @@ </formalpara> <para> <screen> -mysqladmin -u root password &#39;<replaceable>new-root-user-password</replaceable>&#39; +mysqladmin -u root password '<replaceable>new-root-user-password</replaceable>' </screen> </para> <orderedlist> @@ -226,18 +226,18 @@ </para> <para> <screen> -mysql&gt; GRANT ALL PRIVILEGES ON gateinjcr.* TO &#39;<replaceable>gateinuser</replaceable>&#39;@&#39;localhost&#39; -IDENTIFIED BY &#39;<replaceable>gateinpassword</replaceable>&#39; WITH GRANT OPTION; +mysql&gt; GRANT ALL PRIVILEGES ON gateinjcr.* TO '<replaceable>gateinuser</replaceable>'@'localhost' +IDENTIFIED BY '<replaceable>gateinpassword</replaceable>' WITH GRANT OPTION; </screen> <screen> -mysql&gt; GRANT ALL PRIVILEGES ON gateinidm.* TO &#39;<replaceable>gateinuser</replaceable>&#39;@&#39;localhost&#39; -IDENTIFIED BY &#39;<replaceable>gateinpassword</replaceable>&#39; WITH GRANT OPTION; +mysql&gt; GRANT ALL PRIVILEGES ON gateinidm.* TO '<replaceable>gateinuser</replaceable>'@'localhost' +IDENTIFIED BY '<replaceable>gateinpassword</replaceable>' WITH GRANT OPTION; </screen> </para> <!-- <note><title>Note: Changed password?</title> <para> - If you changed the portal user&#39;s password, remember to also change the password in the MySQL Datasource descriptor. + If you changed the portal user's password, remember to also change the password in the MySQL Datasource descriptor. </para> </note> --> Modified: epp/docs/branches/5.0/Installation_Guide/en-US/Getting_Started.xml =================================================================== --- epp/docs/branches/5.0/Installation_Guide/en-US/Getting_Started.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Installation_Guide/en-US/Getting_Started.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -484,7 +484,7 @@ <title>Installing and Configuring JDK 6.0 on a generic Linux platform</title> <listitem> <para> - Download the Java 2 Platform, Standard Edition (J2SE) Development Kit (JDK) 6.0 from Sun&#39;s website: <ulink url="http://java.sun.com/javase/downloads/index.jsp#need">&l...;. + Download the Java 2 Platform, Standard Edition (J2SE) Development Kit (JDK) 6.0 from Sun's website: <ulink url="http://java.sun.com/javase/downloads/index.jsp#need">&l...;. </para> </listitem> <listitem> @@ -557,7 +557,7 @@ As root, type the following command at the shell prompt and you should see something like this: </para> <programlisting>[root@vsr ~]$ /usr/sbin/alternatives --config java -There are 2 programs which provide &#39;java&#39;. +There are 2 programs which provide 'java'. Selection Command ----------------------------------------------- 1 /usr/lib/jvm/jre-1.4.2-gcj/bin/java @@ -566,7 +566,7 @@ </programlisting> <para> - Make sure the Sun version - <literal>jre-1.6.0-sun</literal> in this case - is selected (marked with a &#39;+&#39; in the output), or select it by entering its number as prompted. + Make sure the Sun version - <literal>jre-1.6.0-sun</literal> in this case - is selected (marked with a '+' in the output), or select it by entering its number as prompted. </para> </listitem> <listitem> @@ -575,7 +575,7 @@ </para> <programlisting> [root@vsr ~]$ /usr/sbin/alternatives --config javac -There are 1 programs which provide &#39;javac&#39;. +There are 1 programs which provide 'javac'. Selection Command ----------------------------------------------- *+ 1 /usr/lib/jvm/java-1.6.0-sun/bin/javac @@ -583,7 +583,7 @@ </programlisting> <programlisting> [root@vsr ~]$ /usr/sbin/alternatives --config java_sdk_1.6.0 -There are 1 programs which provide &#39;java_sdk_1.6.0&#39;. +There are 1 programs which provide 'java_sdk_1.6.0'. Selection Command ----------------------------------------------- *+ 1 /usr/lib/jvm/java-1.6.0-sun @@ -612,7 +612,7 @@ <title>Installing and Configuring JDK 6.0 on Microsoft Windows</title> <listitem> <para> - Download the Java 2 Platform, Standard Edition (J2SE) Development Kit (JDK) 6.0 from Sun&#39;s website: <ulink url="http://java.sun.com/javase/downloads/index.jsp#need">&l...;. + Download the Java 2 Platform, Standard Edition (J2SE) Development Kit (JDK) 6.0 from Sun's website: <ulink url="http://java.sun.com/javase/downloads/index.jsp#need">&l...;. </para> </listitem> <listitem> Modified: epp/docs/branches/5.0/Installation_Guide/en-US/Launching.xml =================================================================== --- epp/docs/branches/5.0/Installation_Guide/en-US/Launching.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Installation_Guide/en-US/Launching.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -91,7 +91,7 @@ </procedure> <para> - An alternative shutdown method is to &#39;kill&#39; the process running the product. This can be done by: + An alternative shutdown method is to 'kill' the process running the product. This can be done by: </para> <orderedlist> <listitem> @@ -101,14 +101,14 @@ </listitem> <listitem> <para> - Issuing the following command with the product&#39;s process ID (<literal>PID</literal>) in another terminal instance: + Issuing the following command with the product's process ID (<literal>PID</literal>) in another terminal instance: <programlisting><command>kill <replaceable>PID</replaceable></command> </programlisting> </para> </listitem> <listitem> <para> - Using your operating system&#39;s native System Monitor to shut the process down graphically. + Using your operating system's native System Monitor to shut the process down graphically. </para> </listitem> </orderedlist> Modified: epp/docs/branches/5.0/Installation_Guide/en-US/fallback_content/Conventions.xml =================================================================== --- epp/docs/branches/5.0/Installation_Guide/en-US/fallback_content/Conventions.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Installation_Guide/en-US/fallback_content/Conventions.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -151,7 +151,7 @@ <important> <title>Important</title> <para> - Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' won't cause data loss but may cause irritation and frustration. + Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' will not cause data loss but may cause irritation and frustration. </para> </important> <warning> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/Common_Content/Conventions.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/Common_Content/Conventions.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/Common_Content/Conventions.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -70,7 +70,7 @@ The above text includes application names; system-wide menu names and items; application-specific menu names; and buttons and text found within a GUI interface, all presented in proportional bold and all distinguishable by context. </para> <para> - Note the <guimenu>&#62;</guimenu> shorthand used to indicate traversal through a menu and its sub-menus. This avoids difficult-to-follow phrasing such as &#39;Select <guimenuitem>Mouse</guimenuitem> from the <guimenu>Preferences</guimenu> sub-menu in the <guimenu>System</guimenu> menu of the main menu bar&#39;. + Note the <guimenu>&#62;</guimenu> shorthand used to indicate traversal through a menu and its sub-menus. This avoids difficult-to-follow phrasing such as 'Select <guimenuitem>Mouse</guimenuitem> from the <guimenu>Preferences</guimenu> sub-menu in the <guimenu>System</guimenu> menu of the main menu bar'. </para> <para> <command><replaceable>Mono-spaced Bold Italic</replaceable></command> or <application><replaceable>Proportional Bold Italic</replaceable></application> @@ -131,7 +131,7 @@ EchoHome home = (EchoHome) ref; Echo echo = home.create(); System.out.println(&#34;Created Echo&#34;); -System.out.println(&#34;Echo.echo(&#39;Hello&#39;) = &#34; + echo.echo(&#34;Hello&#34;)); +System.out.println(&#34;Echo.echo('Hello') = &#34; + echo.echo(&#34;Hello&#34;)); } } </programlisting> @@ -152,7 +152,7 @@ <important> <title>Important</title> <para> - Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled &#39;Important&#39; won&#39;t cause data loss but may cause irritation and frustration. + Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' will not cause data loss but may cause irritation and frustration. </para> </important> <warning> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/Feedback.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/Feedback.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/Feedback.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -13,7 +13,7 @@ If you find a typographical error in this manual, or if you have thought of a way to make this manual better, we would love to hear from you! Please submit a report in Bugzilla: <ulink url="http://bugzilla.redhat.com/bugzilla/">http://bugzilla.r... against the product <application>JBoss Enterprise Portal Platform</application>. </para> <para> - When submitting a bug report, be sure to mention the manual&#39;s identifier: <citetitle>&BOOKID;</citetitle> + When submitting a bug report, be sure to mention the manual's identifier: <citetitle>&BOOKID;</citetitle> </para> <para> If you have a suggestion for improving the documentation, try to be as specific as possible when describing it. If you have found an error, please include the section number and some of the surrounding text so we can find it easily. Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/Foundations.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -86,7 +86,7 @@ <section id="sect-Reference_Guide-Configuration_syntax-External_Plugins"> <title>External Plugins</title> <para> - The eXo Kernel supports non-component objects that can be configured, instantiated, and injected into registered components using method calls. This &#39;<emphasis>plugin</emphasis>&#39; method allows portal extensions to add additional configurations to core services. + The eXo Kernel supports non-component objects that can be configured, instantiated, and injected into registered components using method calls. This '<emphasis>plugin</emphasis>' method allows portal extensions to add additional configurations to core services. </para> <para> An external plugin is defined by using the <literal>&#60;external-component-plugin&#62;</literal> wrapper element which contains one or more <literal>&#60;component-plugin&#62;</literal> definitions. @@ -117,7 +117,7 @@ The included files must be valid xml files; they cannot be fragments of text. </para> <para> - Below is an example <filename>configuration.xml</filename> that &#39;outsources&#39; its content into several files: + Below is an example <filename>configuration.xml</filename> that 'outsources' its content into several files: </para> <programlistingco> <areaspec> @@ -128,7 +128,7 @@ <calloutlist> <callout arearefs="area-Reference_Guide-Configuration_syntax-Includes_and_special_URLs-url_schema"> <para> - This line is being used to reference another configuration file. The <code>war:</code> URL schema indicates that the following path is to be resolved relative to the current <literal>PortalContainer</literal>&#39;s servlet context resource path, starting with <emphasis role="bold">WEB-INF</emphasis> as a root. + This line is being used to reference another configuration file. The <code>war:</code> URL schema indicates that the following path is to be resolved relative to the current <literal>PortalContainer</literal>'s servlet context resource path, starting with <emphasis role="bold">WEB-INF</emphasis> as a root. </para> </callout> </calloutlist> @@ -143,7 +143,7 @@ Through the extension mechanism the servlet context used for resource loading is a <emphasis role="bold">unified servlet context</emphasis> (this is explaned in a later section). </para> <para> - To have an &#39;include&#39; path resolved relative to current classpath (context classloader), use a <code>&#39;jar:&#39;</code> URL schema. + To have an 'include' path resolved relative to current classpath (context classloader), use a <code>'jar:'</code> URL schema. </para> </section> @@ -178,7 +178,7 @@ Service components that form the JBoss Enterprise Portal Platform infrastructure use <parameter>InitParams</parameter> elements to configure themselves. A component can have one instance of <parameter>InitParams</parameter> injected at most. </para> <para> - If the service component&#39;s constructor takes <parameter>InitParams</parameter> as any of the parameters it will automatically be injected at component instantiation time. + If the service component's constructor takes <parameter>InitParams</parameter> as any of the parameters it will automatically be injected at component instantiation time. </para> <para> The XML configuration for a service component that expects an <parameter>InitParams</parameter> element must have an <parameter>&#60;init-params&#62;</parameter> element present, however this element can be left empty. @@ -247,7 +247,7 @@ The following section has an example of specifying a field of with a <literal>Collection</literal> type. </para> <para> - The <parameter>InitParams</parameter> structure (the names and types of entries) is specific for each service, as it is the code inside a service components&#39; class that defines which entry names to look up and what types it expects to find. + The <parameter>InitParams</parameter> structure (the names and types of entries) is specific for each service, as it is the code inside a service components' class that defines which entry names to look up and what types it expects to find. </para> </section> @@ -350,7 +350,7 @@ The <emphasis role="bold">Extension mechanism</emphasis> makes it possible to override portal resources in a way similar to hardware plug-and-play functionalities. </para> <para> - Customizations can be implemented without unpacking and repacking the original portal <code>.war</code> archives by adding a <code>.war</code> archive to the resources and configuring its position in the portal&#39;s classpath. Custom <code>.war</code> archives can be created with new resources that override the resources in the original archive. + Customizations can be implemented without unpacking and repacking the original portal <code>.war</code> archives by adding a <code>.war</code> archive to the resources and configuring its position in the portal's classpath. Custom <code>.war</code> archives can be created with new resources that override the resources in the original archive. </para> <para> These archives, packaged for use through the extension mechanism, are called <emphasis role="bold">portal extensions</emphasis>. @@ -369,15 +369,15 @@ </step> <step> <para> - Add the application&#39;s servlet context name to the <literal>PortalContainerDefinition</literal>&#39;s list of dependencies. This must be done for each portal container that you want to have access to the new application. + Add the application's servlet context name to the <literal>PortalContainerDefinition</literal>'s list of dependencies. This must be done for each portal container that you want to have access to the new application. </para> <para> - The application&#39;s position in these lists will dictate its priority when the portal loads resources. The later your application appears in the list, the higher its resource priority will be. + The application's position in these lists will dictate its priority when the portal loads resources. The later your application appears in the list, the higher its resource priority will be. </para> </step> <step> <para> - At this point your new web archive will be on both the portal&#39;s unified classpath and unified servlet context resource path. + At this point your new web archive will be on both the portal's unified classpath and unified servlet context resource path. </para> </step> </procedure> @@ -418,7 +418,7 @@ A servlet in this instance should extend the <literal>org.exoplatform.container.web.AbstractHttpServlet</literal> class so as to properly initialize the current <literal>PortalContainer</literal>. </para> <para> - This will also set the current thread&#39;s context classloader to one that looks for resources in associated web applications in the order specified by the <emphasis role="bold">dependencies</emphasis> configuration (as seen in <xref linkend="sect-Reference_Guide-Foundations-The_Extension_Mechanism_and_Portal_Extensions" />). + This will also set the current thread's context classloader to one that looks for resources in associated web applications in the order specified by the <emphasis role="bold">dependencies</emphasis> configuration (as seen in <xref linkend="sect-Reference_Guide-Foundations-The_Extension_Mechanism_and_Portal_Extensions" />). </para> <para> Filter classes need to extend the <literal>org.exoplatform.container.web.AbstractFilter</literal>. @@ -433,7 +433,7 @@ <programlisting language="Java" role="Java"><xi:include href="../../extras/Advanced_Development_Foundations/default9.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <note> <para> - This ensures that <literal>AbstractHttpServlet</literal>&#39;s <literal>service()</literal> interception is not overwritten. + This ensures that <literal>AbstractHttpServlet</literal>'s <literal>service()</literal> interception is not overwritten. </para> </note> <para> @@ -450,7 +450,7 @@ <programlisting language="Java" role="Java"><xi:include href="../../extras/Advanced_Development_Foundations/default11.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - If this method returns <emphasis>true</emphasis> the current thread&#39;s context classloader is set up according to the <emphasis role="bold">dependencies</emphasis> configuration and availability of the associated web applications. + If this method returns <emphasis>true</emphasis> the current thread's context classloader is set up according to the <emphasis role="bold">dependencies</emphasis> configuration and availability of the associated web applications. </para> <para> If it returns <emphasis>false</emphasis> the standard application separation rules are used for resource loading (effectively turning off the extension mechanism). Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/configuration.bk =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/configuration.bk 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/configuration.bk 2011-04-20 06:35:00 UTC (rev 6296) @@ -183,7 +183,7 @@ <!-- a4 --> <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-workspace"> <para> - The name of a workspace. This can be obtained using Session&#39;s <literal>login()</literal> or <literal>login(Credentials)</literal> methods for workspaces without an explicit name. + The name of a workspace. This can be obtained using Session's <literal>login()</literal> or <literal>login(Credentials)</literal> methods for workspaces without an explicit name. </para> </callout> <!-- a5 --> @@ -406,7 +406,7 @@ Default permissions of the root node. It is defined as a set of semicolon-delimited permissions containing a group of space-delimited identities and the type of permission. </para> <para> - For example any read;:/admin read;:/admin add_node;:/admin set_property;:/admin remove means that users from group admin have all permissions and other users have only a &#39;read&#39; permission. + For example any read;:/admin read;:/admin add_node;:/admin set_property;:/admin remove means that users from group admin have all permissions and other users have only a 'read' permission. </para> <para> Configurable initializer adds a capability to override workspace initial startup procedure. Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -27,11 +27,11 @@ <term>Repository</term> <listitem> <para> - A repository is a form of data storage device. A &#39;repository&#39; differs from a &#39;database&#39; in the nature of the information contained. While a database holds hard data in rigid tables, a repository may access the data on a database by using less rigid <emphasis>meta</emphasis>-data. In this sense a repository operates as an &#39;interpreter&#39; between the database(s) and the user. + A repository is a form of data storage device. A 'repository' differs from a 'database' in the nature of the information contained. While a database holds hard data in rigid tables, a repository may access the data on a database by using less rigid <emphasis>meta</emphasis>-data. In this sense a repository operates as an 'interpreter' between the database(s) and the user. </para> <note> <para> - The data model for the interface (the repository) is rarely the same as the data model used by the repository&#39;s underlying storage subsystems (such as a database), however the repository is able to make persistent data changes in the storage subsystem. + The data model for the interface (the repository) is rarely the same as the data model used by the repository's underlying storage subsystems (such as a database), however the repository is able to make persistent data changes in the storage subsystem. </para> </note> </listitem> @@ -40,7 +40,7 @@ <term>Workspace</term> <listitem> <para> - The eXo JCR uses &#39;workspaces&#39; as the main data abstraction in its data model. The content is stored in a workspace as a hierarchy of <emphasis>items</emphasis> and each workspace has its own hierarchy of items. + The eXo JCR uses 'workspaces' as the main data abstraction in its data model. The content is stored in a workspace as a hierarchy of <emphasis>items</emphasis> and each workspace has its own hierarchy of items. </para> <para> Repositories access one or more workspaces. Persistent JCR workspaces consist of a directed acyclic graph of <emphasis>items</emphasis> where the edges represent the parent-child relation. Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -610,7 +610,7 @@ <section id="sect-Reference_Guide-Simple_and_Complex_queries-Notes_for_Microsoft_Windows_users"> <title>Notes for Microsoft Windows users</title> <para> - The current configuration of eXo JCR uses Apache DBCP connection pool (<classname>org.apache.commons.dbcp.BasicDataSourceFactory</classname>). It&#39;s possible to set a big value for maxActive parameter in <filename>configuration.xml</filename>. That means usage of lots of TCP/IP ports from a client machine inside the pool (i.e. JDBC driver). As a result the data container can throw exceptions like &#34;Address already in use&#34;. To solve this problem you have to configure the client&#39;s machine networking software for the usage of shorter timeouts for opened TCP/IP ports. + The current configuration of eXo JCR uses Apache DBCP connection pool (<classname>org.apache.commons.dbcp.BasicDataSourceFactory</classname>). It's possible to set a big value for maxActive parameter in <filename>configuration.xml</filename>. That means usage of lots of TCP/IP ports from a client machine inside the pool (i.e. JDBC driver). As a result the data container can throw exceptions like &#34;Address already in use&#34;. To solve this problem you have to configure the client's machine networking software for the usage of shorter timeouts for opened TCP/IP ports. </para> <para> Microsoft Windows has <parameter>MaxUserPort</parameter>, <parameter>TcpTimedWaitDelay</parameter> registry keys in the node <parameter>HKEY_LOCAL_MACHINESYSTEMCurrentControlSetServicesTcpipParameters</parameter>, by default these keys are unset, set each one with values like these: Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -321,7 +321,7 @@ <calloutlist> <callout arearefs="area-Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-cache.jdbc.templates"> <para> - All the configurable parameters in this file are populated with templates which will be replaced with LockManager&#39;s configuration parameters. + All the configurable parameters in this file are populated with templates which will be replaced with LockManager's configuration parameters. </para> </callout> </calloutlist> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -283,7 +283,7 @@ The corresponding CSV files are named <filename>Statistics<replaceable>${interface-name}</replaceable>-<replaceable>${creation-timestamp}</replaceable>.csv</filename>. For more details about how the CSV files are managed please refer to the section dedicated to the statistics manager. </para> <para> - The format of each column header is <replaceable>${method-alias}</replaceable>-<replaceable>${metric-alias}</replaceable>. The method alias will be of type <replaceable>${method-name}</replaceable> (a list of parameter types separated by &#39;<emphasis role="bold">;</emphasis>&#39; to be compatible with the CSV format). + The format of each column header is <replaceable>${method-alias}</replaceable>-<replaceable>${metric-alias}</replaceable>. The method alias will be of type <replaceable>${method-name}</replaceable> (a list of parameter types separated by '<emphasis role="bold">;</emphasis>' to be compatible with the CSV format). </para> <para> The metric aliases are described in <xref linkend="sect-Reference_Guide-eXo_JCR_statistics-Statistics_Manager" />. Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -8,7 +8,7 @@ <section id="sect-Reference_Guide-TransactionManagerLookup-Configuration"> <title>Configuration</title> <para> - It&#39;s JBossCache class registered as eXo container component in configuration.xml file. + It's JBossCache class registered as eXo container component in configuration.xml file. </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_transaction-manager-lookup/default90.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -138,7 +138,7 @@ <term>defaultGroupType</term> <listitem> <para> - The name of the PicketLink IDM GroupType that will be used to store groups. The default is &#39;<literal>GTN_GROUP_TYPE</literal>&#39;. + The name of the PicketLink IDM GroupType that will be used to store groups. The default is '<literal>GTN_GROUP_TYPE</literal>'. </para> </listitem> </varlistentry> @@ -146,7 +146,7 @@ <term>rootGroupName</term> <listitem> <para> - The name of the PicketLink IDM Group that will be used as a root parent. The default is &#39;<literal>GTN_ROOT_GROUP</literal>&#39; + The name of the PicketLink IDM Group that will be used as a root parent. The default is '<literal>GTN_ROOT_GROUP</literal>' </para> </listitem> </varlistentry> @@ -162,7 +162,7 @@ <term>useParentIdAsGroupType</term> <listitem> <para> - This parameter stores the parent ID path as a group type in PicketLink IDM for any IDs not mapped with a specific type in &#39;<literal>groupTypeMappings</literal>&#39;. If this option is set to <emphasis>false</emphasis>, and no mappings are provided under &#39;<literal>groupTypeMappings</literal>&#39;, then only one group with the given name can exist in the JBoss Enterprise Portal Platform group tree. + This parameter stores the parent ID path as a group type in PicketLink IDM for any IDs not mapped with a specific type in '<literal>groupTypeMappings</literal>'. If this option is set to <emphasis>false</emphasis>, and no mappings are provided under '<literal>groupTypeMappings</literal>', then only one group with the given name can exist in the JBoss Enterprise Portal Platform group tree. </para> </listitem> </varlistentry> @@ -170,7 +170,7 @@ <term>pathSeparator</term> <listitem> <para> - When &#39;<literal>userParentIdAsGroupType</literal>&#39; is set to <emphasis>true</emphasis>, this value will be used to replace all &#34;/&#34; characters in IDs. The &#34;/&#34; character is not allowed to be used in group type name in PicketLink IDM. + When '<literal>userParentIdAsGroupType</literal>' is set to <emphasis>true</emphasis>, this value will be used to replace all &#34;/&#34; characters in IDs. The &#34;/&#34; character is not allowed to be used in group type name in PicketLink IDM. </para> </listitem> </varlistentry> @@ -200,7 +200,7 @@ <term>forceMembershipOfMappedTypes</term> <listitem> <para> - Groups stored in PicketLink IDM with a type mapped in &#39;<literal>groupTypeMappings</literal>&#39; will automatically be members under the mapped parent. Group relationships linked by PicketLink IDM group association will not be necessary. + Groups stored in PicketLink IDM with a type mapped in '<literal>groupTypeMappings</literal>' will automatically be members under the mapped parent. Group relationships linked by PicketLink IDM group association will not be necessary. </para> <para> This parameter can be set to <emphasis>false</emphasis> if all groups are added via JBoss Enterprise Portal Platform APIs. This may be useful with LDAP configuration as, when set to true, it will make every entry added to LDAP appear in JBoss Enterprise Portal Platform. This, however, is not true for entries added via JBoss Enterprise Portal Platform management UI. Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -21,7 +21,7 @@ <term>User Profile</term> <listitem> <para> - The <literal>User Profile</literal> component contains extra information about a user, such as user&#39;s personal information, and business information. You can also add additional information about a user if your application requires it. + The <literal>User Profile</literal> component contains extra information about a user, such as user's personal information, and business information. You can also add additional information about a user if your application requires it. </para> </listitem> </varlistentry> @@ -48,7 +48,7 @@ The <literal>Membership</literal> component connects a User, a Group and a Membership Type. </para> <para> - A user can have one or more memberships within a group. For example: <emphasis role="bold">User A</emphasis> can have the &#39;<emphasis>member</emphasis>&#39; and &#39;<emphasis>admin</emphasis>&#39; memberships in group <emphasis role="bold">/user</emphasis>. A user belongs to a group if he has at least one membership in that group. + A user can have one or more memberships within a group. For example: <emphasis role="bold">User A</emphasis> can have the '<emphasis>member</emphasis>' and '<emphasis>admin</emphasis>' memberships in group <emphasis role="bold">/user</emphasis>. A user belongs to a group if he has at least one membership in that group. </para> </listitem> </varlistentry> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -88,12 +88,12 @@ The plugin type <literal>org.exoplatform.services.organization.impl.NewUserEventListener</literal> specifies which groups all newly created users should become members of. </para> <para> - It specifies the group memberships and the membership types to use (while a <emphasis>group</emphasis> is just a set of users, a membership <emphasis>type</emphasis> represents a user&#39;s role within a group). It also specifies a list of users that should not be processed (such as administrative users like &#39;<literal>root</literal>&#39;). + It specifies the group memberships and the membership types to use (while a <emphasis>group</emphasis> is just a set of users, a membership <emphasis>type</emphasis> represents a user's role within a group). It also specifies a list of users that should not be processed (such as administrative users like '<literal>root</literal>'). </para> <note> <title>Terminology</title> <para> - The terms &#39;<emphasis role="bold">membership</emphasis>&#39; and &#39;<emphasis role="bold">membership type</emphasis>&#39; refer to the same thing, and are used interchangeably. + The terms '<emphasis role="bold">membership</emphasis>' and '<emphasis role="bold">membership type</emphasis>' refer to the same thing, and are used interchangeably. </para> </note> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -158,7 +158,7 @@ </para> <note> <para> - At this stage the login functionality won&#39;t be available. + At this stage the login functionality will not be available. </para> </note> <mediaobject> @@ -183,7 +183,7 @@ <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default105.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - There&#39;s a line comment already in this source file to assist you. + There's a line comment already in this source file to assist you. </para> </step> <step> @@ -215,14 +215,14 @@ <title>Redirect to CAS</title> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default106.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> </step> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default107.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -381,14 +381,14 @@ <title>Setup the portal to redirect to JOSSO</title> <step> <para> - In the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file modify the &#39;Sign In&#39; link as follows: + In the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file modify the 'Sign In' link as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default112.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> </step> <step> <para> - modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: + modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default113.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -627,7 +627,7 @@ </step> <step> <para> - Repeat step 7 for the &#39;<literal>gatein</literal>&#39; realm as well. + Repeat step 7 for the '<literal>gatein</literal>' realm as well. </para> </step> </procedure> @@ -681,14 +681,14 @@ <title>Setup the portal to redirect to OpenSSO</title> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default119.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> </step> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default120.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -773,12 +773,12 @@ <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default124.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - The &#39;<literal>keyTab</literal>&#39; value should point to the keytab file that was generated by the <literal>kadmin</literal> Kerberos tool. See the <ulink type="http" url="http://community.jboss.org/wiki/SettingupyourKerberosDevelopmen... up your Kerberos Development Environment</ulink> guide for more details. + The '<literal>keyTab</literal>' value should point to the keytab file that was generated by the <literal>kadmin</literal> Kerberos tool. See the <ulink type="http" url="http://community.jboss.org/wiki/SettingupyourKerberosDevelopmen... up your Kerberos Development Environment</ulink> guide for more details. </para> </step> <step> <para> - Extend the core authentication mechanisms to support SPNEGO Under <filename>deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml</filename>, add a &#39;<literal>SPNEGO</literal>&#39; authenticators property + Extend the core authentication mechanisms to support SPNEGO Under <filename>deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml</filename>, add a '<literal>SPNEGO</literal>' authenticators property </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default125.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -820,12 +820,12 @@ </step> <step> <para> - Edit the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</filename> to match the following: + Edit the '<emphasis role="bold">Sign In</emphasis>' link in <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</filename> to match the following: </para> <programlisting language="Java" role="Java"><xi:include href="../../extras/Authentication_Identity_SSO/default129.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - This modifies the Portal&#39;s &#39;<emphasis role="bold">Sign In</emphasis>&#39; link to perform SPNEGO authentication. + This modifies the Portal's '<emphasis role="bold">Sign In</emphasis>' link to perform SPNEGO authentication. </para> </step> <step> @@ -849,7 +849,7 @@ </procedure> <para> - Clicking the &#39;Sign In&#39; link on the JBoss Enterprise Portal Platform should automatically sign the &#39;demo&#39; user into the portal. + Clicking the 'Sign In' link on the JBoss Enterprise Portal Platform should automatically sign the 'demo' user into the portal. </para> </section> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -47,22 +47,22 @@ In the case of HSQL the databases are created automatically. For any other database you will need to create a database named jdbcjcr_portal (and &#34;jdbcjcr_sample-portal&#34; if you have gatein-sample-portal.ear in <filename><replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy</filename>). </para> <para> - Note that some databases don&#39;t accept &#39;-&#39; in the database name, so you may have to remove <filename><replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-sample-portal.ear</filename>) + Note that some databases don't accept '-' in the database name, so you may have to remove <filename><replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-sample-portal.ear</filename>) </para> <para> Make sure the user has rights to create tables on jdbcjcr_portal, and to update them as they will be automatically created during the first startup . </para> <para> - Also add your database&#39;s JDBC driver into the classpath - you can put it in <replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/lib (or <replaceable>TOMCAT_HOME</replaceable>/lib, if you are running on Tomcat) + Also add your database's JDBC driver into the classpath - you can put it in <replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/lib (or <replaceable>TOMCAT_HOME</replaceable>/lib, if you are running on Tomcat) </para> <para> MySQL example: </para> <para> - Let&#39;s configure our JCR to store data in MySQL. Let&#39;s pretend we have a user named &#34;gateinuser&#34; with a password &#34;gateinpassword&#34;. We would create a database &#34;mygateindb_portal&#34; (remember that _portal is required), and assign our user the rights to create tables. + Let's configure our JCR to store data in MySQL. Let's pretend we have a user named &#34;gateinuser&#34; with a password &#34;gateinpassword&#34;. We would create a database &#34;mygateindb_portal&#34; (remember that _portal is required), and assign our user the rights to create tables. </para> <para> - Then we need to add MySQL&#39;s JDBC driver to the classpath, and finally edit gatein.ear/02portal.war/WEB-INF/conf/jcr/jcr-configuration to contain the following: + Then we need to add MySQL's JDBC driver to the classpath, and finally edit gatein.ear/02portal.war/WEB-INF/conf/jcr/jcr-configuration to contain the following: <programlisting>gatein.jcr.datasource.driver=com.mysql.jdbc.Driver gatein.jcr.datasource.url=jdbc:mysql://localhost:3306/mygateindb${container.name.suffix} gatein.jcr.datasource.username=gateinuser Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -36,7 +36,7 @@ It is preconfigured for GMail, so that any GMail account can easily be used (simply use the full GMail address as username, and fill-in the password. </para> <para> - In corporate environments you will want to use your corporate SMTP gateway. When using it over SSL, like in default configuration, you may need to configure a certificate truststore, containing your SMTP server&#39;s public certificate. Depending on the key sizes, you may then also need to install Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files for your Java Runtime Environment. + In corporate environments you will want to use your corporate SMTP gateway. When using it over SSL, like in default configuration, you may need to configure a certificate truststore, containing your SMTP server's public certificate. Depending on the key sizes, you may then also need to install Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files for your Java Runtime Environment. </para> </section> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/Introduction.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/Introduction.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/Introduction.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -6,7 +6,7 @@ <chapter id="chap-Reference_Guide-Introduction"> <title>Introduction</title> <para> - JBoss Enterprise Portal Platform is based on the GateIn project which is the merge of two mature Java projects; JBoss Portal and eXo Portal. This new community project takes the best of both offerings and incorporates them into a single portal framework. The aim is to provide an intuitive user-friendly portal, and a framework to address the needs of today&#39;s Web 2.0 applications. + JBoss Enterprise Portal Platform is based on the GateIn project which is the merge of two mature Java projects; JBoss Portal and eXo Portal. This new community project takes the best of both offerings and incorporates them into a single portal framework. The aim is to provide an intuitive user-friendly portal, and a framework to address the needs of today's Web 2.0 applications. </para> <mediaobject> <imageobject role="html"> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -8,10 +8,10 @@ <section id="sect-Reference_Guide-Default_Portal_Configuration-Overview"> <title>Overview</title> <para> - JBoss Enterprise Portal Platform&#39;s default home page URL is <literal>http://{hostname}:{port}/portal/</literal>. There may be multiple independent portals deployed in parallel at any given time, each of which has its root context (<literal>http://{hostname}:{port}/sample-portal/</literal>, for example). + JBoss Enterprise Portal Platform's default home page URL is <literal>http://{hostname}:{port}/portal/</literal>. There may be multiple independent portals deployed in parallel at any given time, each of which has its root context (<literal>http://{hostname}:{port}/sample-portal/</literal>, for example). </para> <para> - Each portal container is internally composed of one or more &#39;portals&#39;. This is because there needs to be at least one such portal available. The default portal is called &#39;<emphasis>Classic</emphasis>&#39;. When accessing JBoss Enterprise Portal Platform&#39;s default URL, you are automatically directed to the &#39;<emphasis>Classic</emphasis>&#39; portal. + Each portal container is internally composed of one or more 'portals'. This is because there needs to be at least one such portal available. The default portal is called '<emphasis>Classic</emphasis>'. When accessing JBoss Enterprise Portal Platform's default URL, you are automatically directed to the '<emphasis>Classic</emphasis>' portal. </para> <para> The default portal performs another important task. When starting up JBoss Enterprise Portal Platform for the first time, its JCR database (where portal runtime-configurable settings are stored) will be empty . The default portal detects this and triggers automatic data initialization. Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -33,7 +33,7 @@ <programlisting language="XML" role="XML"><xi:include href="../../extras/PortalDevelopment_DefaultPortalNavigationConfiguration/default144.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - This XML configuration defines where in the portal&#39;s <literal>WAR</literal> to look for configuration settings, and which portals, groups, and user specific views to include in portal/group/user navigation. + This XML configuration defines where in the portal's <literal>WAR</literal> to look for configuration settings, and which portals, groups, and user specific views to include in portal/group/user navigation. </para> <para> The first time the portal is launched those files will be used to create an initial navigation. That information will then be stored in the JCR content repository and can be modified and managed from the portal UI. @@ -92,7 +92,7 @@ For top nodes, the <emphasis role="bold">uri</emphasis> and the <emphasis role="bold">name</emphasis> of your navigation nodes must have the <emphasis>same</emphasis> value. For other nodes the <emphasis role="bold">uri</emphasis> is a relative path. </para> <para> - For example; <emphasis><uri>contentmanagement/fileexplorer</uri></emphasis> where &#39;<literal>contentmanagement</literal> &#39; is the name of the parent node and &#39;<literal>fileexplorer</literal>&#39; is the name of the node ( <emphasis>&#60;name&#62;fileexplorer&#60;/name&#62; </emphasis> ). + For example; <emphasis><uri>contentmanagement/fileexplorer</uri></emphasis> where '<literal>contentmanagement</literal> ' is the name of the parent node and '<literal>fileexplorer</literal>' is the name of the node ( <emphasis>&#60;name&#62;fileexplorer&#60;/name&#62; </emphasis> ). </para> </warning> </listitem> @@ -132,7 +132,7 @@ This configuration file structure is very similar to <filename>portal.xml</filename> and it can also contain container tags (some usage examples of container tags can be found in <filename>02portal.war/WEB-INF/conf/portal/portal/sharedlayout.xml</filename>). </para> <para> - Each application can decide whether to render the portlet border, the window state, the icons or portlet&#39;s mode. + Each application can decide whether to render the portlet border, the window state, the icons or portlet's mode. </para> <!-- DOC NOTE: look into including some actual examples of 'container tags' from sharedlayout.xml in place here. --> @@ -161,7 +161,7 @@ <section id="sect-Reference_Guide-Portal_Navigation_Configuration-User_Navigation"> <title>User Navigation</title> <para> - User navigation is the set of nodes and pages that are owned by a user. They are part of the user&#39;s dashboard. + User navigation is the set of nodes and pages that are owned by a user. They are part of the user's dashboard. </para> <para> Two files configure the user navigation (<filename>navigation.xml</filename> and <filename>pages.xml</filename>). They are located in the directory &#34;<filename>02portal.war/WEB-INF/conf/portal/users/{userName}</filename>&#34;. Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -66,7 +66,7 @@ <term>mandatory.groups</term> <listitem> <para> - Groups that can&#39;t be deleted. + Groups that can't be deleted. </para> </listitem> </varlistentry> @@ -74,7 +74,7 @@ <term>mandatory.mstypes</term> <listitem> <para> - Membership types that can&#39;t be deleted. + Membership types that can't be deleted. </para> </listitem> </varlistentry> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -47,7 +47,7 @@ It is also possible to use a proprietary XML format to define translations. This is a more convenient way to translate a document for some languages such as Japanese, Arabic or Russian. </para> <para> - Property files have to be ISO 8859-1 encoded, while the XML file can define its encoding. As a result it&#39;s easier for a human being to read a translation in XML instead of having to decode and encode the property file. + Property files have to be ISO 8859-1 encoded, while the XML file can define its encoding. As a result it's easier for a human being to read a translation in XML instead of having to decode and encode the property file. </para> <para> For more information refer to: <xref linkend="chap-Reference_Guide-XML_Resources_Bundles" /> @@ -189,7 +189,7 @@ </step> <step> <para> - In <filename>portlet.xml</filename>, add <parameter>Spanish</parameter> as a <emphasis role="bold">supported-locale</emphasis> (&#39;<emphasis role="bold">es</emphasis>&#39; is the two letter code for Spanish). The <emphasis role="bold">resource-bundle</emphasis> is already declared and is the same for all languages : + In <filename>portlet.xml</filename>, add <parameter>Spanish</parameter> as a <emphasis role="bold">supported-locale</emphasis> ('<emphasis role="bold">es</emphasis>' is the two letter code for Spanish). The <emphasis role="bold">resource-bundle</emphasis> is already declared and is the same for all languages : </para> <programlisting language="XML" role="XML">&#60;supported-locale&#62;en&#60;/supported-locale&#62; Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -12,7 +12,7 @@ Every portlet can have its own javscript code but in many cases it is more convenient to reuse some existing shared libraries. For that reason, JBoss Enterprise Portal Platform has a mechanism to easily register the libraries that will be loaded when the first page is rendered. </para> <para> - To do so, every WAR deployed in JBoss Enterprise Portal Platform can register the <filename>.js</filename> files with the groovy script <filename>WEB-INF/conf/script/groovy/JavascriptScript.groovy</filename>. (TODO: this file doesn&#39;t seem to exist) + To do so, every WAR deployed in JBoss Enterprise Portal Platform can register the <filename>.js</filename> files with the groovy script <filename>WEB-INF/conf/script/groovy/JavascriptScript.groovy</filename>. (TODO: this file doesn't seem to exist) </para> <para> The example file below is found in the <literal>01eXoResources.war</literal> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -61,7 +61,7 @@ <term>dir</term> <listitem> <para> - The string &#39;<emphasis role="bold">ltr</emphasis>&#39; if the orientation is LT or the string &#39;<emphasis role="bold">rtl</emphasis>&#39; if the orientation is RT. + The string '<emphasis role="bold">ltr</emphasis>' if the orientation is LT or the string '<emphasis role="bold">rtl</emphasis>' if the orientation is RT. </para> </listitem> </varlistentry> @@ -139,7 +139,7 @@ </para> <note> <para> - It is important to consider whether the image to be mirrored is symmetrical as this will impact it&#39;s final appearance. + It is important to consider whether the image to be mirrored is symmetrical as this will impact it's final appearance. </para> </note> <para> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -65,7 +65,7 @@ <note> <title>CSS Classes</title> <para> - The window decorators and the default portlet specification CSS classes should be considered separate types of skinning components, but they need to be included as part of the overall portal skin. The portal skin must include these components&#39; CSS classes or they will not be displayed correctly. + The window decorators and the default portlet specification CSS classes should be considered separate types of skinning components, but they need to be included as part of the overall portal skin. The portal skin must include these components' CSS classes or they will not be displayed correctly. </para> <para> A portlet skin does not need to be included as part of the portal skin and can be included within the portlets web application. @@ -108,7 +108,7 @@ <section id="sect-Reference_Guide-Skinning_the_Portal-Skins_in_Page_Markups"> <title>Skins in Page Markups</title> <para> - A JBoss Enterprise Portal Platform skin contains CSS styles for the portal&#39;s components but also shares components that may be reused in portlets. When JBoss Enterprise Portal Platform generates a portal page markup, it inserts stylesheet links in the page&#39;s <literal>head</literal> tag. + A JBoss Enterprise Portal Platform skin contains CSS styles for the portal's components but also shares components that may be reused in portlets. When JBoss Enterprise Portal Platform generates a portal page markup, it inserts stylesheet links in the page's <literal>head</literal> tag. </para> <para> There are two main types of CSS links that will appear in the <literal>head</literal> tag: a link to the portal skin CSS file and a link to the portlet skin CSS files. @@ -169,7 +169,7 @@ <section id="sect-Reference_Guide-The_Skin_Service-Resource_Request_Filter"> <title>Resource Request Filter</title> <para> - Because of JBoss Enterprise Portal Platform&#39;s Right-To-Left support, all CSS files need to be retrieved through a Servlet filter and the web application needs to be configured to activate this filter. This is already done for <literal>01eXoResources.war</literal> web application which contains the default skin. + Because of JBoss Enterprise Portal Platform's Right-To-Left support, all CSS files need to be retrieved through a Servlet filter and the web application needs to be configured to activate this filter. This is already done for <literal>01eXoResources.war</literal> web application which contains the default skin. </para> <para> Any new web applications containing skinning CSS files will need to have the following added to their <filename>web.xml</filename> : @@ -197,7 +197,7 @@ <term>gatein-resources.xml</term> <listitem> <para> - For the default portal skin, this file contains definitions for the portal skin, the window decorations that this skin provides and well as defining some javascript resources which are not related to the skin. The default portal skin doesn&#39;t directly define portlet skins, these should be provided by the portlets themselves. + For the default portal skin, this file contains definitions for the portal skin, the window decorations that this skin provides and well as defining some javascript resources which are not related to the skin. The default portal skin doesn't directly define portlet skins, these should be provided by the portlets themselves. </para> </listitem> </varlistentry> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -33,7 +33,7 @@ <section id="sect-Reference_Guide-XML_Resources_Bundles-XML_format"> <title>XML format</title> <para> - The XML format is very simple and has been developed based on the &#39;Don&#39;t Repeat Yourself&#39; (DRY) principle. Usually resource bundle keys are hierarchically defined and we can leverage the hierarchic nature of the XML for that purpose. Here is an example of turning a property file into an XML resource bundle file: + The XML format is very simple and has been developed based on the 'Don't Repeat Yourself' (DRY) principle. Usually resource bundle keys are hierarchically defined and we can leverage the hierarchic nature of the XML for that purpose. Here is an example of turning a property file into an XML resource bundle file: </para> <programlisting language="Java" role="Java"><xi:include href="../../extras/PortalDevelopment_XMLResourceBundles/default195.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -6,7 +6,7 @@ <section id="sect-Reference_Guide-Bridge_Configuration"> <title>Bridge Configuration</title> <para> - The 329 specification is aimed at making the developer&#39;s life as easy as possible with JSF+Portlet development. You will see below that there are minimal settings to getting any JSF web application up and running in the Portal environment. + The 329 specification is aimed at making the developer's life as easy as possible with JSF+Portlet development. You will see below that there are minimal settings to getting any JSF web application up and running in the Portal environment. </para> <para> If you are new to these concepts, we highly recommend you refer to <xref linkend="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes" />. @@ -40,10 +40,10 @@ </init-param> ]]></programlisting> --> <para> - When <parameter>preserveActionParams</parameter> is set to <parameter>TRUE</parameter>, the bridge must maintain any request parameters assigned during the portlet&#39;s action request. + When <parameter>preserveActionParams</parameter> is set to <parameter>TRUE</parameter>, the bridge must maintain any request parameters assigned during the portlet's action request. </para> <para> - The request parameters are maintained in the<emphasis>&#34;bridge request scope&#34;</emphasis>. When this attribute is not present or is <parameter>FALSE</parameter> the action&#39;s request parameters are only maintained for the duration of the <emphasis>portlet request scope</emphasis>. + The request parameters are maintained in the<emphasis>&#34;bridge request scope&#34;</emphasis>. When this attribute is not present or is <parameter>FALSE</parameter> the action's request parameters are only maintained for the duration of the <emphasis>portlet request scope</emphasis>. </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Configuration/default198.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -9,7 +9,7 @@ JBoss Portlet Bridge not only gives you the ability to run JSF web applications in a portlet, but also gives you the benefit of running supported JBoss frameworks like <application>Seam</application> and <application>RichFaces</application>. </para> <section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Whats_New_in_2.0"> - <title>What&#39;s New in 2.0?</title> + <title>What's New in 2.0?</title> <section id="sect-Reference_Guide-Whats_New_in_2.0-Eventing"> <title>Eventing</title> <para> @@ -50,13 +50,13 @@ The bridge automates the processing of public render parameters. </para> <para> - A public render parameter can be mapped to an object&#39;s accessor (<literal>get</literal>/<literal>set</literal> method) designed to handle a String representation of the value via a <application>Faces</application> <literal>ValueExpression</literal>. + A public render parameter can be mapped to an object's accessor (<literal>get</literal>/<literal>set</literal> method) designed to handle a String representation of the value via a <application>Faces</application> <literal>ValueExpression</literal>. </para> <para> - When a new public render parameter value is received in a request, the bridge sets the value by calling the <literal>ValueExpression</literal>&#39;s <parameter>setValue()</parameter>. + When a new public render parameter value is received in a request, the bridge sets the value by calling the <literal>ValueExpression</literal>'s <parameter>setValue()</parameter>. </para> <para> - At the end of a request, if the current value of any mapped public render parameter doesn&#39;t match the current incoming value, the bridge sets the new value in an outgoing public render parameter (if feasible in the given phase). + At the end of a request, if the current value of any mapped public render parameter doesn't match the current incoming value, the bridge sets the new value in an outgoing public render parameter (if feasible in the given phase). </para> <para> See <xref linkend="sect-Reference_Guide-Portlet_2.0_Coordination-Public_Render_Parameters" /> for details and examples. @@ -83,7 +83,7 @@ For example, the <literal>PortalIdentity</literal> <application>Seam</application> component allows you to instantly have Single Sign-On (SSO) between <application>Seam</application> and <application>GateIn</application> or <application>JBoss Enterprise Portal Platform</application>. </para> <para> - This extension is configured in your <application>Seam</application> application&#39;s <filename>components.xml</filename> file as follows. + This extension is configured in your <application>Seam</application> application's <filename>components.xml</filename> file as follows. </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_GettingStarted/default218.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -14,7 +14,7 @@ When your application uses request attributes on a per request basis and you do not want that particular attribute to be managed in the extended bridge request scope, you must use the following configuration in your <filename>faces-config.xml</filename>. </para> <para> - In the code sample below you can see that any attribute namespaced as <literal>foo.bar</literal> or any attribute beginning with <literal>foo.baz(wildcard)</literal> will be excluded from the bridge request scope and only be used per that application&#39;s request. + In the code sample below you can see that any attribute namespaced as <literal>foo.bar</literal> or any attribute beginning with <literal>foo.baz(wildcard)</literal> will be excluded from the bridge request scope and only be used per that application's request. </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Portlet_Development/default223.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -27,7 +27,7 @@ A <literal>PortletMode</literal> represents a distinct render path within an application. There are three standard modes: <emphasis>view</emphasis>, <emphasis>edit</emphasis>, and <emphasis>help</emphasis>. </para> <para> - The bridge&#39;s <literal>ExternalContext.encodeActionURL</literal> recognizes the query string parameter <literal>javax.portlet.faces.PortletMode</literal> and uses this parameter&#39;s value to set the portlet mode on the underlying portlet <literal>actionURL</literal> or response. + The bridge's <literal>ExternalContext.encodeActionURL</literal> recognizes the query string parameter <literal>javax.portlet.faces.PortletMode</literal> and uses this parameter's value to set the portlet mode on the underlying portlet <literal>actionURL</literal> or response. </para> <para> Once processed it then removes this parameter from the query string. This means the following navigation rule causes one to render the \edit.jspx viewId in the portlet edit mode: @@ -38,9 +38,9 @@ <section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Navigating_to_a_modes_last_viewId"> - <title>Navigating to a mode&#39;s last viewId</title> + <title>Navigating to a mode's last viewId</title> <para> - By default a mode change will start in the mode&#39;s default view without any (prior) existing state. One common portlet pattern when returning to a mode left after entering another mode (e.g.. view -&#62; edit -&#62; view) is to return to the last view (and state) of this origin mode. + By default a mode change will start in the mode's default view without any (prior) existing state. One common portlet pattern when returning to a mode left after entering another mode (e.g.. view -&#62; edit -&#62; view) is to return to the last view (and state) of this origin mode. </para> <para> The bridge will explicitly encode the necessary information so that when returning to a prior mode it can target the appropriate view and restore the appropriate state. @@ -69,7 +69,7 @@ <programlisting language="XML" role="XML">/viewId?javax.portlet.faces.PortletMode=view&amp;.... </programlisting> <para> - Without wildcarding, when a subsequent navigation occurs from this new view, the navigation rules wouldn&#39;t resolve because there wouldn&#39;t be an exact match. Likewise, the above <literal>edit.jspx</literal> + Without wildcarding, when a subsequent navigation occurs from this new view, the navigation rules wouldn't resolve because there wouldn't be an exact match. Likewise, the above <literal>edit.jspx</literal> </para> <programlisting language="XML" role="XML">&#60;from-view-id&#62; @@ -194,7 +194,7 @@ Then, in your JSP or Facelets page, you can use: </para> -<programlisting language="XML" role="XML">#{httpSessionScope[&#39;your parameter name&#39;]} +<programlisting language="XML" role="XML">#{httpSessionScope['your parameter name']} </programlisting> <para> <note> Modified: epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml =================================================================== --- epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -369,7 +369,7 @@ </callout> <callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.portletinfo"> <para> - When rendered, the portlet&#39;s title is displayed as the header in the portlet window, unless it is overridden programmatically. In the example above the title would be <literal>Simplest Hello World Portlet</literal> . + When rendered, the portlet's title is displayed as the header in the portlet window, unless it is overridden programmatically. In the example above the title would be <literal>Simplest Hello World Portlet</literal> . </para> </callout> </calloutlist> @@ -563,7 +563,7 @@ As well as the <literal>VIEW</literal> portlet mode, the specification defines two other modes; <literal>EDIT</literal> and <literal>HELP</literal>. </para> <para> - These modes need to be defined in the <filename>portlet.xml</filename> descriptor. This will enable the corresponding buttons on the portlet&#39;s window. + These modes need to be defined in the <filename>portlet.xml</filename> descriptor. This will enable the corresponding buttons on the portlet's window. </para> <para> The generic portlet that is inherited dispatches the different views to the methods: <literal>doView</literal> , <literal>doHelp</literal> and <literal>doEdit</literal>. @@ -737,7 +737,7 @@ <section id="sect-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge_"> <title>JSF example using the JBoss Portlet Bridge </title> <para> - In order to write a portlet using JSF a &#39;bridge&#39; is needed. This software allows developers to write a portlet application as if it was a JSF application. The bridge then negotiates the interactions between the two layers. + In order to write a portlet using JSF a 'bridge' is needed. This software allows developers to write a portlet application as if it was a JSF application. The bridge then negotiates the interactions between the two layers. </para> <para> An example using the JBoss Portlet Bridge is available in the <filename>/jboss-epp-5.0-src/portal/examples/portlets/</filename> directory of the JBoss Enterprise Portal Platform sources package or the <filename>/jboss-epp-5.0-docs/epp-doc/examples/portlets</filename> directory of the documentation package. The configuration is slightly different from a JSP application. This example can be used as a base to configure instead of creating a new application. @@ -810,17 +810,17 @@ </callout> <callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.view"> <para> - This is a mandatory parameter to define what&#39;s the default page to display. + This is a mandatory parameter to define what's the default page to display. </para> </callout> <callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.edit"> <para> - This parameter defines which page to display on the &#39;edit&#39; mode. + This parameter defines which page to display on the 'edit' mode. </para> </callout> <callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.help"> <para> - This parameter defines which page to display on the &#39;help&#39; mode. + This parameter defines which page to display on the 'help' mode. </para> </callout> </calloutlist> Modified: epp/docs/branches/5.0/Release_Notes/en-US/Common_Content/Conventions.xml =================================================================== --- epp/docs/branches/5.0/Release_Notes/en-US/Common_Content/Conventions.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Release_Notes/en-US/Common_Content/Conventions.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -152,7 +152,7 @@ <important> <title>Important</title> <para> - Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' won't cause data loss but may cause irritation and frustration. + Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' will not cause data loss but may cause irritation and frustration. </para> </important> <warning> Modified: epp/docs/branches/5.0/Site_Publisher_Technical_Preview_Release_Notes/en-US/Introduction.xml =================================================================== --- epp/docs/branches/5.0/Site_Publisher_Technical_Preview_Release_Notes/en-US/Introduction.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/Site_Publisher_Technical_Preview_Release_Notes/en-US/Introduction.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -54,7 +54,7 @@ <note> <title>Subscription</title> <para> - While this technical preview is available to existing Enterprise Portal Platform customers at no additional charge during the Technology Preview phase, it is Red Hat&#39;s intention to deliver JBoss Enterprise Portal Platform Site Publisher as a fully supported add on subscription to EPP. These subscriptions will be available at an additional fee over and above EPP Subscriptions when EPP Site Publisher is generally available. + While this technical preview is available to existing Enterprise Portal Platform customers at no additional charge during the Technology Preview phase, it is Red Hat's intention to deliver JBoss Enterprise Portal Platform Site Publisher as a fully supported add on subscription to EPP. These subscriptions will be available at an additional fee over and above EPP Subscriptions when EPP Site Publisher is generally available. </para> </note> Modified: epp/docs/branches/5.0/User_Guide/en-US/Common_Content/Conventions.xml =================================================================== --- epp/docs/branches/5.0/User_Guide/en-US/Common_Content/Conventions.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.0/User_Guide/en-US/Common_Content/Conventions.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -152,7 +152,7 @@ <important> <title>Important</title> <para> - Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' won't cause data loss but may cause irritation and frustration. + Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' will not cause data loss but may cause irritation and frustration. </para> </important> <warning> Modified: epp/docs/branches/5.1/Installation_Guide/en-US/DatabaseConfiguration.xml =================================================================== --- epp/docs/branches/5.1/Installation_Guide/en-US/DatabaseConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Installation_Guide/en-US/DatabaseConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -155,7 +155,7 @@ </formalpara> <para> <screen> -mysqladmin -u root password &#39;<replaceable>new-root-user-password</replaceable>&#39; +mysqladmin -u root password '<replaceable>new-root-user-password</replaceable>' </screen> </para> <orderedlist> @@ -227,18 +227,18 @@ </para> <para> <screen> -mysql&gt; GRANT ALL PRIVILEGES ON gateinjcr.* TO &#39;<replaceable>gateinuser</replaceable>&#39;@&#39;localhost&#39; -IDENTIFIED BY &#39;<replaceable>gateinpassword</replaceable>&#39; WITH GRANT OPTION; +mysql&gt; GRANT ALL PRIVILEGES ON gateinjcr.* TO '<replaceable>gateinuser</replaceable>'@'localhost' +IDENTIFIED BY '<replaceable>gateinpassword</replaceable>' WITH GRANT OPTION; </screen> <screen> -mysql&gt; GRANT ALL PRIVILEGES ON gateinidm.* TO &#39;<replaceable>gateinuser</replaceable>&#39;@&#39;localhost&#39; -IDENTIFIED BY &#39;<replaceable>gateinpassword</replaceable>&#39; WITH GRANT OPTION; +mysql&gt; GRANT ALL PRIVILEGES ON gateinidm.* TO '<replaceable>gateinuser</replaceable>'@'localhost' +IDENTIFIED BY '<replaceable>gateinpassword</replaceable>' WITH GRANT OPTION; </screen> </para> <!-- <note><title>Note: Changed password?</title> <para> - If you changed the portal user&#39;s password, remember to also change the password in the MySQL Datasource descriptor. + If you changed the portal user's password, remember to also change the password in the MySQL Datasource descriptor. </para> </note> --> Modified: epp/docs/branches/5.1/Installation_Guide/en-US/Getting_Started.xml =================================================================== --- epp/docs/branches/5.1/Installation_Guide/en-US/Getting_Started.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Installation_Guide/en-US/Getting_Started.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -563,7 +563,7 @@ <title>Installing and Configuring JDK 6.0 on a generic Linux platform</title> <listitem> <para> - Download the Java 2 Platform, Standard Edition (J2SE) Development Kit (JDK) 6.0 from Sun&#39;s website: <ulink url="http://java.sun.com/javase/downloads/index.jsp#need">&l...;. + Download the Java 2 Platform, Standard Edition (J2SE) Development Kit (JDK) 6.0 from Sun's website: <ulink url="http://java.sun.com/javase/downloads/index.jsp#need">&l...;. </para> </listitem> <listitem> @@ -635,7 +635,7 @@ As root, type the following command at the shell prompt and you should see something like this: </para> <programlisting>[root@vsr ~]$ /usr/sbin/alternatives --config java -There are 2 programs which provide &#39;java&#39;. +There are 2 programs which provide 'java'. Selection Command ----------------------------------------------- 1 /usr/lib/jvm/jre-1.4.2-gcj/bin/java @@ -644,7 +644,7 @@ </programlisting> <para> - Make sure the Sun version - <literal>jre-1.6.0-sun</literal> in this case - is selected (marked with a &#39;+&#39; in the output), or select it by entering its number as prompted. + Make sure the Sun version - <literal>jre-1.6.0-sun</literal> in this case - is selected (marked with a '+' in the output), or select it by entering its number as prompted. </para> </listitem> <listitem> @@ -653,7 +653,7 @@ </para> <programlisting> [root@vsr ~]$ /usr/sbin/alternatives --config javac -There are 1 programs which provide &#39;javac&#39;. +There are 1 programs which provide 'javac'. Selection Command ----------------------------------------------- *+ 1 /usr/lib/jvm/java-1.6.0-sun/bin/javac @@ -661,7 +661,7 @@ </programlisting> <programlisting> [root@vsr ~]$ /usr/sbin/alternatives --config java_sdk_1.6.0 -There are 1 programs which provide &#39;java_sdk_1.6.0&#39;. +There are 1 programs which provide 'java_sdk_1.6.0'. Selection Command ----------------------------------------------- *+ 1 /usr/lib/jvm/java-1.6.0-sun @@ -690,7 +690,7 @@ <title>Installing and Configuring JDK 6.0 on Microsoft Windows</title> <listitem> <para> - Download the Java 2 Platform, Standard Edition (J2SE) Development Kit (JDK) 6.0 from Sun&#39;s website: <ulink url="http://java.sun.com/javase/downloads/index.jsp#need">&l...;. + Download the Java 2 Platform, Standard Edition (J2SE) Development Kit (JDK) 6.0 from Sun's website: <ulink url="http://java.sun.com/javase/downloads/index.jsp#need">&l...;. </para> </listitem> <listitem> Modified: epp/docs/branches/5.1/Installation_Guide/en-US/Launching.xml =================================================================== --- epp/docs/branches/5.1/Installation_Guide/en-US/Launching.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Installation_Guide/en-US/Launching.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -91,7 +91,7 @@ </procedure> <para> - An alternative shutdown method is to &#39;kill&#39; the process running the product. This can be done by: + An alternative shutdown method is to 'kill' the process running the product. This can be done by: </para> <orderedlist> <listitem> @@ -101,14 +101,14 @@ </listitem> <listitem> <para> - Issuing the following command with the product&#39;s process ID (<literal>PID</literal>) in another terminal instance: + Issuing the following command with the product's process ID (<literal>PID</literal>) in another terminal instance: <programlisting><command>kill <replaceable>PID</replaceable></command> </programlisting> </para> </listitem> <listitem> <para> - Using your operating system&#39;s native System Monitor to shut the process down graphically. + Using your operating system's native System Monitor to shut the process down graphically. </para> </listitem> </orderedlist> Modified: epp/docs/branches/5.1/Installation_Guide/en-US/fallback_content/Conventions.xml =================================================================== --- epp/docs/branches/5.1/Installation_Guide/en-US/fallback_content/Conventions.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Installation_Guide/en-US/fallback_content/Conventions.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -151,7 +151,7 @@ <important> <title>Important</title> <para> - Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' won't cause data loss but may cause irritation and frustration. + Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' will not cause data loss but may cause irritation and frustration. </para> </important> <warning> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/Common_Content/Conventions.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/Common_Content/Conventions.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/Common_Content/Conventions.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -70,7 +70,7 @@ The above text includes application names; system-wide menu names and items; application-specific menu names; and buttons and text found within a GUI interface, all presented in proportional bold and all distinguishable by context. </para> <para> - Note the <guimenu>&#62;</guimenu> shorthand used to indicate traversal through a menu and its sub-menus. This avoids difficult-to-follow phrasing such as &#39;Select <guimenuitem>Mouse</guimenuitem> from the <guimenu>Preferences</guimenu> sub-menu in the <guimenu>System</guimenu> menu of the main menu bar&#39;. + Note the <guimenu>&#62;</guimenu> shorthand used to indicate traversal through a menu and its sub-menus. This avoids difficult-to-follow phrasing such as 'Select <guimenuitem>Mouse</guimenuitem> from the <guimenu>Preferences</guimenu> sub-menu in the <guimenu>System</guimenu> menu of the main menu bar'. </para> <para> <command><replaceable>Mono-spaced Bold Italic</replaceable></command> or <application><replaceable>Proportional Bold Italic</replaceable></application> @@ -131,7 +131,7 @@ EchoHome home = (EchoHome) ref; Echo echo = home.create(); System.out.println(&#34;Created Echo&#34;); -System.out.println(&#34;Echo.echo(&#39;Hello&#39;) = &#34; + echo.echo(&#34;Hello&#34;)); +System.out.println(&#34;Echo.echo('Hello') = &#34; + echo.echo(&#34;Hello&#34;)); } } </programlisting> @@ -152,7 +152,7 @@ <important> <title>Important</title> <para> - Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled &#39;Important&#39; won&#39;t cause data loss but may cause irritation and frustration. + Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' will not cause data loss but may cause irritation and frustration. </para> </important> <warning> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/Feedback.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/Feedback.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/Feedback.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -13,7 +13,7 @@ If you find a typographical error in this manual, or if you have thought of a way to make this manual better, we would love to hear from you! Please submit a report in Bugzilla: <ulink url="http://bugzilla.redhat.com/bugzilla/">http://bugzilla.r... against the product <application>JBoss Enterprise Portal Platform</application>. </para> <para> - When submitting a bug report, be sure to mention the manual&#39;s identifier: <citetitle>&BOOKID;</citetitle> + When submitting a bug report, be sure to mention the manual's identifier: <citetitle>&BOOKID;</citetitle> </para> <para> If you have a suggestion for improving the documentation, try to be as specific as possible when describing it. If you have found an error, please include the section number and some of the surrounding text so we can find it easily. Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/Foundations.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -86,7 +86,7 @@ <section id="sect-Reference_Guide-Configuration_syntax-External_Plugins"> <title>External Plug-ins</title> <para> - The eXo Kernel supports non-component objects that can be configured, instantiated, and injected into registered components using method calls. This &#39;<emphasis>plugin</emphasis>&#39; method allows portal extensions to add additional configurations to core services. + The eXo Kernel supports non-component objects that can be configured, instantiated, and injected into registered components using method calls. This '<emphasis>plugin</emphasis>' method allows portal extensions to add additional configurations to core services. </para> <para> An external plugin is defined by using the <literal>&#60;external-component-plugin&#62;</literal> wrapper element which contains one or more <literal>&#60;component-plugin&#62;</literal> definitions. @@ -117,7 +117,7 @@ The included files must be valid xml files; they cannot be fragments of text. </para> <para> - Below is an example <filename>configuration.xml</filename> that &#39;outsources&#39; its content into several files: + Below is an example <filename>configuration.xml</filename> that 'outsources' its content into several files: </para> <programlistingco> <areaspec> @@ -128,7 +128,7 @@ <calloutlist> <callout arearefs="area-Reference_Guide-Configuration_syntax-Includes_and_special_URLs-url_schema"> <para> - This line is being used to reference another configuration file. The <code>war:</code> URL schema indicates that the following path is to be resolved relative to the current <literal>PortalContainer</literal>&#39;s servlet context resource path, starting with <emphasis role="bold">WEB-INF</emphasis> as a root. + This line is being used to reference another configuration file. The <code>war:</code> URL schema indicates that the following path is to be resolved relative to the current <literal>PortalContainer</literal>'s servlet context resource path, starting with <emphasis role="bold">WEB-INF</emphasis> as a root. </para> </callout> </calloutlist> @@ -143,7 +143,7 @@ Through the extension mechanism the servlet context used for resource loading is a <emphasis role="bold">unified servlet context</emphasis> (this is explained in a later section). </para> <para> - To have an &#39;include&#39; path resolved relative to current classpath (context classloader), use a <code>&#39;jar:&#39;</code> URL schema. + To have an 'include' path resolved relative to current classpath (context classloader), use a <code>'jar:'</code> URL schema. </para> </section> @@ -178,7 +178,7 @@ Service components that form the JBoss Enterprise Portal Platform infrastructure use <parameter>InitParams</parameter> elements to configure themselves. A component can have one instance of <parameter>InitParams</parameter> injected at most. </para> <para> - If the service component&#39;s constructor takes <parameter>InitParams</parameter> as any of the parameters it will automatically be injected at component instantiation time. + If the service component's constructor takes <parameter>InitParams</parameter> as any of the parameters it will automatically be injected at component instantiation time. </para> <para> The XML configuration for a service component that expects an <parameter>InitParams</parameter> element must have an <parameter>&#60;init-params&#62;</parameter> element present, however this element can be left empty. @@ -247,7 +247,7 @@ The following section has an example of specifying a field of with a <literal>Collection</literal> type. </para> <para> - The <parameter>InitParams</parameter> structure (the names and types of entries) is specific for each service, as it is the code inside a service components&#39; class that defines which entry names to look up and what types it expects to find. + The <parameter>InitParams</parameter> structure (the names and types of entries) is specific for each service, as it is the code inside a service components' class that defines which entry names to look up and what types it expects to find. </para> </section> @@ -350,7 +350,7 @@ The <emphasis role="bold">Extension mechanism</emphasis> makes it possible to override portal resources in a way similar to hardware plug-and-play functionalities. </para> <para> - Customizations can be implemented without unpacking and repacking the original portal <code>.war</code> archives by adding a <code>.war</code> archive to the resources and configuring its position in the portal&#39;s classpath. Custom <code>.war</code> archives can be created with new resources that override the resources in the original archive. + Customizations can be implemented without unpacking and repacking the original portal <code>.war</code> archives by adding a <code>.war</code> archive to the resources and configuring its position in the portal's classpath. Custom <code>.war</code> archives can be created with new resources that override the resources in the original archive. </para> <para> These archives, packaged for use through the extension mechanism, are called <emphasis role="bold">portal extensions</emphasis>. @@ -369,15 +369,15 @@ </step> <step> <para> - Add the application&#39;s servlet context name to the <literal>PortalContainerDefinition</literal>&#39;s list of dependencies. This must be done for each portal container that you want to have access to the new application. + Add the application's servlet context name to the <literal>PortalContainerDefinition</literal>'s list of dependencies. This must be done for each portal container that you want to have access to the new application. </para> <para> - The application&#39;s position in these lists will dictate its priority when the portal loads resources. The later your application appears in the list, the higher its resource priority will be. + The application's position in these lists will dictate its priority when the portal loads resources. The later your application appears in the list, the higher its resource priority will be. </para> </step> <step> <para> - At this point your new web archive will be on both the portal&#39;s unified classpath and unified servlet context resource path. + At this point your new web archive will be on both the portal's unified classpath and unified servlet context resource path. </para> </step> </procedure> @@ -418,7 +418,7 @@ A servlet in this instance should extend the <literal>org.exoplatform.container.web.AbstractHttpServlet</literal> class so as to properly initialize the current <literal>PortalContainer</literal>. </para> <para> - This will also set the current thread&#39;s context classloader to one that looks for resources in associated web applications in the order specified by the <emphasis role="bold">dependencies</emphasis> configuration (as seen in <xref linkend="sect-Reference_Guide-Foundations-The_Extension_Mechanism_and_Portal_Extensions" />). + This will also set the current thread's context classloader to one that looks for resources in associated web applications in the order specified by the <emphasis role="bold">dependencies</emphasis> configuration (as seen in <xref linkend="sect-Reference_Guide-Foundations-The_Extension_Mechanism_and_Portal_Extensions" />). </para> <para> Filter classes need to extend the <literal>org.exoplatform.container.web.AbstractFilter</literal>. @@ -433,7 +433,7 @@ <programlisting language="Java" role="Java"><xi:include href="../../extras/Advanced_Development_Foundations/default9.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <note> <para> - This ensures that <literal>AbstractHttpServlet</literal>&#39;s <literal>service()</literal> interception is not overwritten. + This ensures that <literal>AbstractHttpServlet</literal>'s <literal>service()</literal> interception is not overwritten. </para> </note> <para> @@ -450,7 +450,7 @@ <programlisting language="Java" role="Java"><xi:include href="../../extras/Advanced_Development_Foundations/default11.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - If this method returns <emphasis>true</emphasis> the current thread&#39;s context classloader is set up according to the <emphasis role="bold">dependencies</emphasis> configuration and availability of the associated web applications. + If this method returns <emphasis>true</emphasis> the current thread's context classloader is set up according to the <emphasis role="bold">dependencies</emphasis> configuration and availability of the associated web applications. </para> <para> If it returns <emphasis>false</emphasis> the standard application separation rules are used for resource loading (effectively turning off the extension mechanism). Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -27,11 +27,11 @@ <term>Repository</term> <listitem> <para> - A repository is a form of data storage device. A &#39;repository&#39; differs from a &#39;database&#39; in the nature of the information contained. While a database holds hard data in rigid tables, a repository may access the data on a database by using less rigid <emphasis>meta</emphasis>-data. In this sense a repository operates as an &#39;interpreter&#39; between the database(s) and the user. + A repository is a form of data storage device. A 'repository' differs from a 'database' in the nature of the information contained. While a database holds hard data in rigid tables, a repository may access the data on a database by using less rigid <emphasis>meta</emphasis>-data. In this sense a repository operates as an 'interpreter' between the database(s) and the user. </para> <note> <para> - The data model for the interface (the repository) is rarely the same as the data model used by the repository&#39;s underlying storage subsystems (such as a database), however the repository is able to make persistent data changes in the storage subsystem. + The data model for the interface (the repository) is rarely the same as the data model used by the repository's underlying storage subsystems (such as a database), however the repository is able to make persistent data changes in the storage subsystem. </para> </note> </listitem> @@ -40,7 +40,7 @@ <term>Workspace</term> <listitem> <para> - The eXo JCR uses &#39;workspaces&#39; as the main data abstraction in its data model. The content is stored in a workspace as a hierarchy of <emphasis>items</emphasis> and each workspace has its own hierarchy of items. + The eXo JCR uses 'workspaces' as the main data abstraction in its data model. The content is stored in a workspace as a hierarchy of <emphasis>items</emphasis> and each workspace has its own hierarchy of items. </para> <para> Repositories access one or more workspaces. Persistent JCR workspaces consist of a directed acyclic graph of <emphasis>items</emphasis> where the edges represent the parent-child relation. Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -610,7 +610,7 @@ <section id="sect-Reference_Guide-Simple_and_Complex_queries-Notes_for_Microsoft_Windows_users"> <title>Notes for Microsoft Windows users</title> <para> - The current configuration of eXo JCR uses Apache DBCP connection pool (<classname>org.apache.commons.dbcp.BasicDataSourceFactory</classname>). It&#39;s possible to set a big value for maxActive parameter in <filename>configuration.xml</filename>. That means usage of lots of TCP/IP ports from a client machine inside the pool (i.e. JDBC driver). As a result the data container can throw exceptions like &#34;Address already in use&#34;. To solve this problem you have to configure the client&#39;s machine networking software for the usage of shorter timeouts for opened TCP/IP ports. + The current configuration of eXo JCR uses Apache DBCP connection pool (<classname>org.apache.commons.dbcp.BasicDataSourceFactory</classname>). It's possible to set a big value for maxActive parameter in <filename>configuration.xml</filename>. That means usage of lots of TCP/IP ports from a client machine inside the pool (i.e. JDBC driver). As a result the data container can throw exceptions like &#34;Address already in use&#34;. To solve this problem you have to configure the client's machine networking software for the usage of shorter timeouts for opened TCP/IP ports. </para> <para> Microsoft Windows has <parameter>MaxUserPort</parameter>, <parameter>TcpTimedWaitDelay</parameter> registry keys in the node <parameter>HKEY_LOCAL_MACHINESYSTEMCurrentControlSetServicesTcpipParameters</parameter>, by default these keys are unset, set each one with values like these: Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -316,7 +316,7 @@ <calloutlist> <callout arearefs="area-Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-cache.jdbc.templates"> <para> - All the configurable parameters in this file are populated with templates which will be replaced with LockManager&#39;s configuration parameters. + All the configurable parameters in this file are populated with templates which will be replaced with LockManager's configuration parameters. </para> </callout> </calloutlist> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -283,7 +283,7 @@ The corresponding CSV files are named <filename>Statistics<replaceable>${interface-name}</replaceable>-<replaceable>${creation-timestamp}</replaceable>.csv</filename>. For more details about how the CSV files are managed please refer to the section dedicated to the statistics manager. </para> <para> - The format of each column header is <replaceable>${method-alias}</replaceable>-<replaceable>${metric-alias}</replaceable>. The method alias will be of type <replaceable>${method-name}</replaceable> (a list of parameter types separated by &#39;<emphasis role="bold">;</emphasis>&#39; to be compatible with the CSV format). + The format of each column header is <replaceable>${method-alias}</replaceable>-<replaceable>${metric-alias}</replaceable>. The method alias will be of type <replaceable>${method-name}</replaceable> (a list of parameter types separated by '<emphasis role="bold">;</emphasis>' to be compatible with the CSV format). </para> <para> The metric aliases are described in <xref linkend="sect-Reference_Guide-eXo_JCR_statistics-Statistics_Manager" />. Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -8,7 +8,7 @@ <section id="sect-Reference_Guide-TransactionManagerLookup-Configuration"> <title>Configuration</title> <para> - It&#39;s JBossCache class registered as eXo container component in configuration.xml file. + It's JBossCache class registered as eXo container component in configuration.xml file. </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_transaction-manager-lookup/default90.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -135,7 +135,7 @@ <term>defaultGroupType</term> <listitem> <para> - The name of the PicketLink IDM GroupType that will be used to store groups. The default is &#39;<literal>GTN_GROUP_TYPE</literal>&#39;. + The name of the PicketLink IDM GroupType that will be used to store groups. The default is '<literal>GTN_GROUP_TYPE</literal>'. </para> </listitem> </varlistentry> @@ -143,7 +143,7 @@ <term>rootGroupName</term> <listitem> <para> - The name of the PicketLink IDM Group that will be used as a root parent. The default is &#39;<literal>GTN_ROOT_GROUP</literal>&#39; + The name of the PicketLink IDM Group that will be used as a root parent. The default is '<literal>GTN_ROOT_GROUP</literal>' </para> </listitem> </varlistentry> @@ -159,7 +159,7 @@ <term>useParentIdAsGroupType</term> <listitem> <para> - This parameter stores the parent ID path as a group type in PicketLink IDM for any IDs not mapped with a specific type in &#39;<literal>groupTypeMappings</literal>&#39;. If this option is set to <emphasis>false</emphasis>, and no mappings are provided under &#39;<literal>groupTypeMappings</literal>&#39;, then only one group with the given name can exist in the JBoss Enterprise Portal Platform group tree. + This parameter stores the parent ID path as a group type in PicketLink IDM for any IDs not mapped with a specific type in '<literal>groupTypeMappings</literal>'. If this option is set to <emphasis>false</emphasis>, and no mappings are provided under '<literal>groupTypeMappings</literal>', then only one group with the given name can exist in the JBoss Enterprise Portal Platform group tree. </para> </listitem> </varlistentry> @@ -167,7 +167,7 @@ <term>pathSeparator</term> <listitem> <para> - When &#39;<literal>userParentIdAsGroupType</literal>&#39; is set to <emphasis>true</emphasis>, this value will be used to replace all &#34;/&#34; characters in IDs. The &#34;/&#34; character is not allowed to be used in group type name in PicketLink IDM. + When '<literal>userParentIdAsGroupType</literal>' is set to <emphasis>true</emphasis>, this value will be used to replace all &#34;/&#34; characters in IDs. The &#34;/&#34; character is not allowed to be used in group type name in PicketLink IDM. </para> </listitem> </varlistentry> @@ -197,7 +197,7 @@ <term>forceMembershipOfMappedTypes</term> <listitem> <para> - Groups stored in PicketLink IDM with a type mapped in &#39;<literal>groupTypeMappings</literal>&#39; will automatically be members under the mapped parent. Group relationships linked by PicketLink IDM group association will not be necessary. + Groups stored in PicketLink IDM with a type mapped in '<literal>groupTypeMappings</literal>' will automatically be members under the mapped parent. Group relationships linked by PicketLink IDM group association will not be necessary. </para> <para> This parameter can be set to <emphasis>false</emphasis> if all groups are added via JBoss Enterprise Portal Platform APIs. This may be useful with LDAP configuration as, when set to true, it will make every entry added to LDAP appear in JBoss Enterprise Portal Platform. This, however, is not true for entries added via JBoss Enterprise Portal Platform management UI. Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/LDAP.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/LDAP.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/LDAP.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -477,9 +477,200 @@ <section id="sect-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store"> <title>LDAP as Default Store</title> <para> - The procedure to set LDAP up as the default identity store for + The procedure to set LDAP up as the default identity store for JBoss Enterprise Portal Platform. </para> - + <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store"> + <title>Set up LDAP as Default Indentity Store</title> + <step> + <para> + Open the <filename><replaceable>ID_HOME</replaceable>/idm-configuration.xml</filename> file. + </para> + <para> + JBoss Enterprise Portal Platform uses the PicketLink IDM framework as the underlying identity storage system, hence all the configurations use dedicated Picketlink settings. + </para> + </step> + <step> + <para> + Comment out the default Picketlink <literal>config</literal> value: <parameter>war:/conf/organization/picketlink-idm/picketlink-idm-config.xml</parameter> + </para> + </step> + <step> + <para> + Uncomment the appropriate sample configuration values as described below, depending on which Directory Server you are implementing: + </para> + <itemizedlist> + <listitem> + <para> + <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-RHDS_or_OpenDS"/> + </para> + </listitem> + <listitem> + <para> + <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-MSAD"/> + </para> + </listitem> + <listitem> + <para> + <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-OpenLDAP"/> + </para> + </listitem> + </itemizedlist> + + <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-RHDS_or_OpenDS"> + <title>Red Hat Directory Server or OpenDS</title> + <step> + <para> + Uncomment the line under "<emphasis>Read Only "ACME" LDAP Example</emphasis>": + </para> +<programlisting language="XML" role="XML"><![CDATA[<!--Read Only "ACME" LDAP Example--> +<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml</value> +]]></programlisting> + + </step> + <step> + <para> + Uncomment the <parameter>groupTypeMappings</parameter> under "<emphasis>Uncomment for ACME LDAP example</emphasis>": + </para> +<programlisting language="XML" role="XML"><![CDATA[<entry> + <key><string>/acme/roles/*</string></key> + <value><string>acme_roles_type</string></value> +</entry> +<entry> + <key><string>/acme/organization_units/*</string></key> + <value><string>acme_ou_type</string></value> +</entry> +]]></programlisting> + <para> + Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate. + </para> + </step> + <step> + <para> + Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-Step-4"/>. + </para> + </step> + </procedure> + + <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-MSAD"> + <title>Microsoft Active Directory</title> + <step> + <para> + Uncomment the line under "<emphasis>MSAD Read Only "ACME" LDAP Example</emphasis>": + </para> +<programlisting language="XML" role="XML"><![CDATA[<!--MSAD Read Only "ACME" LDAP Example--> +<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml</value> +]]></programlisting> + </step> + <step> + <para> + Uncomment the <parameter>groupTypeMappings</parameter> under "<emphasis>Uncomment for MSAD ReadOnly LDAP example</emphasis>": + </para> +<programlisting language="XML" role="XML"><![CDATA[<entry> + <key><string>/acme/roles/*</string></key> + <value><string>msad_roles_type</string></value> +</entry> +]]></programlisting> + <para> + Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate. + </para> + </step> + <step> + <para> + Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-Step-4"/>. + </para> + </step> + </procedure> + + <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-OpenLDAP"> + <title>OpenLDAP</title> + <step> + <para> + Uncomment the line under "<emphasis>OpenLDAP ReadOnly "ACME" LDAP Example</emphasis>": + </para> +<programlisting language="XML" role="XML"><![CDATA[<!--OpenLDAP ReadOnly "ACME" LDAP Example--> +<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml</value> +]]></programlisting> + </step> + <step> + <para> + Uncomment the <parameter>groupTypeMappings</parameter> under "<emphasis>Uncomment for ACME LDAP example</emphasis>": + </para> +<programlisting language="XML" role="XML"><![CDATA[<entry> + <key><string>/acme/roles/*</string></key> + <value><string>acme_roles_type</string></value> +</entry> +<entry> + <key><string>/acme/organization_units/*</string></key> + <value><string>acme_ou_type</string></value> +</entry> +]]></programlisting> + <para> + Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate. + </para> + </step> + <step> + <para> + Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-Step-4"/>. + </para> + </step> + </procedure> + </step> + + <step id="step-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-Step-4"> + <para> + To use a different LDAP server or directory data, edit the DS-specific <filename>.xml</filename> file you uncommented in <emphasis role="bold">Substep 3a</emphasis> above and change the values to suit your requirements. + </para> + <para> + Refer to the list in <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-LDAP_configuration_options"/> for some examples or refer to the product-specific documentation for more information. + </para> + </step> + <step> + <para> + Start the server. + </para> + </step> + <step> + <para> + Navigate to the portal homepage (<ulink type="http" url="http://localhost:8080/portal"></ulink>) and log in as an administrator. + </para> + </step> + <step> + <para> + Navigate to <menuchoice> + <guimenu>Group</guimenu> + <guimenuitem>Organization</guimenuitem> + <guimenuitem>Users and groups management</guimenuitem> + </menuchoice>. + </para> + <substeps> + <step> + <para> + Create a new group called <emphasis>acme</emphasis> under the root node. + </para> + </step> + <step> + <itemizedlist> + <listitem> + <para> + <emphasis role="bold">For RHDS, OpenDS and OpenLDAP</emphasis>: + </para> + <para> + Create two sub-groups called <emphasis>roles</emphasis> and <emphasis>organization_units</emphasis>. + </para> + </listitem> + <listitem> + <para> + <emphasis role="bold">For MSAD:</emphasis> + </para> + <para> + Create a subgroup called <emphasis>roles</emphasis>. + </para> + </listitem> + </itemizedlist> + </step> + </substeps> + </step> + </procedure> </section> <section id="sect-Reference_Guide-LDAP_Integration-Examples"> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -21,7 +21,7 @@ <term>User Profile</term> <listitem> <para> - The <literal>User Profile</literal> component contains extra information about a user, such as user&#39;s personal information, and business information. You can also add additional information about a user if your application requires it. + The <literal>User Profile</literal> component contains extra information about a user, such as user's personal information, and business information. You can also add additional information about a user if your application requires it. </para> </listitem> </varlistentry> @@ -48,7 +48,7 @@ The <literal>Membership</literal> component connects a User, a Group and a Membership Type. </para> <para> - A user can have one or more memberships within a group. For example: <emphasis role="bold">User A</emphasis> can have the &#39;<emphasis>member</emphasis>&#39; and &#39;<emphasis>admin</emphasis>&#39; memberships in group <emphasis role="bold">/user</emphasis>. A user belongs to a group if he has at least one membership in that group. + A user can have one or more memberships within a group. For example: <emphasis role="bold">User A</emphasis> can have the '<emphasis>member</emphasis>' and '<emphasis>admin</emphasis>' memberships in group <emphasis role="bold">/user</emphasis>. A user belongs to a group if he has at least one membership in that group. </para> </listitem> </varlistentry> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -83,12 +83,12 @@ The plugin type <literal>org.exoplatform.services.organization.impl.NewUserEventListener</literal> specifies which groups all newly created users should become members of. </para> <para> - It specifies the group memberships and the membership types to use (while a <emphasis>group</emphasis> is just a set of users, a membership <emphasis>type</emphasis> represents a user&#39;s role within a group). It also specifies a list of users that should not be processed (such as administrative users like &#39;<literal>root</literal>&#39;). + It specifies the group memberships and the membership types to use (while a <emphasis>group</emphasis> is just a set of users, a membership <emphasis>type</emphasis> represents a user's role within a group). It also specifies a list of users that should not be processed (such as administrative users like '<literal>root</literal>'). </para> <note> <title>Terminology</title> <para> - The terms &#39;<emphasis role="bold">membership</emphasis>&#39; and &#39;<emphasis role="bold">membership type</emphasis>&#39; refer to the same thing, and are used interchangeably. + The terms '<emphasis role="bold">membership</emphasis>' and '<emphasis role="bold">membership type</emphasis>' refer to the same thing, and are used interchangeably. </para> </note> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -158,7 +158,7 @@ </para> <note> <para> - At this stage the login functionality won&#39;t be available. + At this stage the login functionality will not be available. </para> </note> <mediaobject> @@ -183,7 +183,7 @@ <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default105.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - There&#39;s a line comment already in this source file to assist you. + There's a line comment already in this source file to assist you. </para> </step> <step> @@ -215,14 +215,14 @@ <title>Redirect to CAS</title> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default106.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> </step> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default107.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -381,14 +381,14 @@ <title>Setup the portal to redirect to JOSSO</title> <step> <para> - In the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file modify the &#39;Sign In&#39; link as follows: + In the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file modify the 'Sign In' link as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default112.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> </step> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default113.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -627,7 +627,7 @@ </step> <step> <para> - Repeat step 7 for the &#39;<literal>gatein</literal>&#39; realm as well. + Repeat step 7 for the '<literal>gatein</literal>' realm as well. </para> </step> </procedure> @@ -681,14 +681,14 @@ <title>Setup the portal to redirect to OpenSSO</title> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default119.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> </step> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default120.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -773,12 +773,12 @@ <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default124.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - The &#39;<literal>keyTab</literal>&#39; value should point to the keytab file that was generated by the <literal>kadmin</literal> Kerberos tool. See the <ulink type="http" url="http://community.jboss.org/wiki/SettingupyourKerberosDevelopmen... up your Kerberos Development Environment</ulink> guide for more details. + The '<literal>keyTab</literal>' value should point to the keytab file that was generated by the <literal>kadmin</literal> Kerberos tool. See the <ulink type="http" url="http://community.jboss.org/wiki/SettingupyourKerberosDevelopmen... up your Kerberos Development Environment</ulink> guide for more details. </para> </step> <step> <para> - Extend the core authentication mechanisms to support SPNEGO. Under <filename>deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml</filename>, add a &#39;<literal>SPNEGO</literal>&#39; authenticators property + Extend the core authentication mechanisms to support SPNEGO. Under <filename>deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml</filename>, add a '<literal>SPNEGO</literal>' authenticators property </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default125.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -820,12 +820,12 @@ </step> <step> <para> - Edit the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</filename> to match the following: + Edit the '<emphasis role="bold">Sign In</emphasis>' link in <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</filename> to match the following: </para> <programlisting language="Java" role="Java"><xi:include href="../../extras/Authentication_Identity_SSO/default129.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - This modifies the Portal&#39;s &#39;<emphasis role="bold">Sign In</emphasis>&#39; link to perform SPNEGO authentication. + This modifies the Portal's '<emphasis role="bold">Sign In</emphasis>' link to perform SPNEGO authentication. </para> </step> <step> @@ -848,7 +848,7 @@ </procedure> <para> - Clicking the &#39;Sign In&#39; link on the JBoss Enterprise Portal Platform should automatically sign the &#39;demo&#39; user into the portal. + Clicking the 'Sign In' link on the JBoss Enterprise Portal Platform should automatically sign the 'demo' user into the portal. </para> </section> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -47,22 +47,22 @@ In the case of HSQL the databases are created automatically. For any other database you will need to create a database named jdbcjcr_portal (and &#34;jdbcjcr_sample-portal&#34; if you have gatein-sample-portal.ear in <filename><replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy</filename>). </para> <para> - Note that some databases don&#39;t accept &#39;-&#39; in the database name, so you may have to remove <filename><replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-sample-portal.ear</filename>) + Note that some databases don't accept '-' in the database name, so you may have to remove <filename><replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-sample-portal.ear</filename>) </para> <para> Make sure the user has rights to create tables on jdbcjcr_portal, and to update them as they will be automatically created during the first start up . </para> <para> - Also add your database&#39;s JDBC driver into the classpath - you can put it in <replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/lib (or <replaceable>TOMCAT_HOME</replaceable>/lib, if you are running on Tomcat) + Also add your database's JDBC driver into the classpath - you can put it in <replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/lib (or <replaceable>TOMCAT_HOME</replaceable>/lib, if you are running on Tomcat) </para> <para> MySQL example: </para> <para> - Let&#39;s configure our JCR to store data in MySQL. Let&#39;s pretend we have a user named &#34;gateinuser&#34; with a password &#34;gateinpassword&#34;. We would create a database &#34;mygateindb_portal&#34; (remember that _portal is required), and assign our user the rights to create tables. + Let's configure our JCR to store data in MySQL. Let's pretend we have a user named &#34;gateinuser&#34; with a password &#34;gateinpassword&#34;. We would create a database &#34;mygateindb_portal&#34; (remember that _portal is required), and assign our user the rights to create tables. </para> <para> - Then we need to add MySQL&#39;s JDBC driver to the classpath, and finally edit gatein.ear/02portal.war/WEB-INF/conf/jcr/jcr-configuration to contain the following: + Then we need to add MySQL's JDBC driver to the classpath, and finally edit gatein.ear/02portal.war/WEB-INF/conf/jcr/jcr-configuration to contain the following: <programlisting>gatein.jcr.datasource.driver=com.mysql.jdbc.Driver gatein.jcr.datasource.url=jdbc:mysql://localhost:3306/mygateindb${container.name.suffix} gatein.jcr.datasource.username=gateinuser Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -36,7 +36,7 @@ It is pre-configured for GMail, so that any GMail account can easily be used (simply use the full GMail address as username, and fill-in the password. </para> <para> - In corporate environments you will want to use your corporate SMTP gateway. When using it over SSL, like in default configuration, you may need to configure a certificate truststore, containing your SMTP server&#39;s public certificate. Depending on the key sizes, you may then also need to install Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files for your Java Runtime Environment. + In corporate environments you will want to use your corporate SMTP gateway. When using it over SSL, like in default configuration, you may need to configure a certificate truststore, containing your SMTP server's public certificate. Depending on the key sizes, you may then also need to install Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files for your Java Runtime Environment. </para> </section> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Introduction.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Introduction.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Introduction.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -6,7 +6,7 @@ <chapter id="chap-Reference_Guide-Introduction"> <title>Introduction</title> <para> - JBoss Enterprise Portal Platform is based on the GateIn project which is the merge of two mature Java projects; JBoss Portal and eXo Portal. This new community project takes the best of both offerings and incorporates them into a single portal framework. The aim is to provide an intuitive user-friendly portal, and a framework to address the needs of today&#39;s Web 2.0 applications. + JBoss Enterprise Portal Platform is based on the GateIn project which is the merge of two mature Java projects; JBoss Portal and eXo Portal. This new community project takes the best of both offerings and incorporates them into a single portal framework. The aim is to provide an intuitive user-friendly portal, and a framework to address the needs of today's Web 2.0 applications. </para> <mediaobject> <imageobject role="html"> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -8,10 +8,10 @@ <section id="sect-Reference_Guide-Default_Portal_Configuration-Overview"> <title>Overview</title> <para> - JBoss Enterprise Portal Platform&#39;s default home page URL is <literal>http://{hostname}:{port}/portal/</literal>. There may be multiple independent portals deployed in parallel at any given time, each of which has its root context (<literal>http://{hostname}:{port}/sample-portal/</literal>, for example). + JBoss Enterprise Portal Platform's default home page URL is <literal>http://{hostname}:{port}/portal/</literal>. There may be multiple independent portals deployed in parallel at any given time, each of which has its root context (<literal>http://{hostname}:{port}/sample-portal/</literal>, for example). </para> <para> - Each portal container is internally composed of one or more &#39;portals&#39;. This is because there needs to be at least one such portal available. The default portal is called &#39;<emphasis>Classic</emphasis>&#39;. When accessing JBoss Enterprise Portal Platform&#39;s default URL, you are automatically directed to the &#39;<emphasis>Classic</emphasis>&#39; portal. + Each portal container is internally composed of one or more 'portals'. This is because there needs to be at least one such portal available. The default portal is called '<emphasis>Classic</emphasis>'. When accessing JBoss Enterprise Portal Platform's default URL, you are automatically directed to the '<emphasis>Classic</emphasis>' portal. </para> <para> The default portal performs another important task. When starting up JBoss Enterprise Portal Platform for the first time, its JCR database (where portal runtime-configurable settings are stored) will be empty . The default portal detects this and triggers automatic data initialization. Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -33,7 +33,7 @@ <programlisting language="XML" role="XML"><xi:include href="../../extras/PortalDevelopment_DefaultPortalNavigationConfiguration/default144.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - This XML configuration defines where in the portal&#39;s <literal>WAR</literal> to look for configuration settings, and which portals, groups, and user specific views to include in portal/group/user navigation. + This XML configuration defines where in the portal's <literal>WAR</literal> to look for configuration settings, and which portals, groups, and user specific views to include in portal/group/user navigation. </para> <para> The first time the portal is launched those files will be used to create an initial navigation. That information will then be stored in the JCR content repository and can be modified and managed from the portal UI. @@ -92,7 +92,7 @@ For top nodes, the <emphasis role="bold">uri</emphasis> and the <emphasis role="bold">name</emphasis> of your navigation nodes must have the <emphasis>same</emphasis> value. For other nodes the <emphasis role="bold">uri</emphasis> is a relative path. </para> <para> - For example; <emphasis><uri>contentmanagement/fileexplorer</uri></emphasis> where &#39;<literal>contentmanagement</literal> &#39; is the name of the parent node and &#39;<literal>fileexplorer</literal>&#39; is the name of the node ( <emphasis>&#60;name&#62;fileexplorer&#60;/name&#62; </emphasis> ). + For example; <emphasis><uri>contentmanagement/fileexplorer</uri></emphasis> where '<literal>contentmanagement</literal> ' is the name of the parent node and '<literal>fileexplorer</literal>' is the name of the node ( <emphasis>&#60;name&#62;fileexplorer&#60;/name&#62; </emphasis> ). </para> </warning> </listitem> @@ -126,7 +126,7 @@ This configuration file structure is very similar to <filename>portal.xml</filename> and it can also contain container tags (some usage examples of container tags can be found in <filename>02portal.war/WEB-INF/conf/portal/portal/sharedlayout.xml</filename>). </para> <para> - Each application can decide whether to render the portlet border, the window state, the icons or portlet&#39;s mode. + Each application can decide whether to render the portlet border, the window state, the icons or portlet's mode. </para> <!-- DOC NOTE: look into including some actual examples of 'container tags' from sharedlayout.xml in place here. --> @@ -155,7 +155,7 @@ <section id="sect-Reference_Guide-Portal_Navigation_Configuration-User_Navigation"> <title>User Navigation</title> <para> - User navigation is the set of nodes and pages that are owned by a user. They are part of the user&#39;s dashboard. + User navigation is the set of nodes and pages that are owned by a user. They are part of the user's dashboard. </para> <para> Two files configure the user navigation (<filename>navigation.xml</filename> and <filename>pages.xml</filename>). They are located in the directory &#34;<filename>02portal.war/WEB-INF/conf/portal/users/{userName}</filename>&#34;. Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -66,7 +66,7 @@ <term>mandatory.groups</term> <listitem> <para> - Groups that can&#39;t be deleted. + Groups that can't be deleted. </para> </listitem> </varlistentry> @@ -74,7 +74,7 @@ <term>mandatory.mstypes</term> <listitem> <para> - Membership types that can&#39;t be deleted. + Membership types that can't be deleted. </para> </listitem> </varlistentry> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -47,7 +47,7 @@ It is also possible to use a proprietary XML format to define translations. This is a more convenient way to translate a document for some languages such as Japanese, Arabic or Russian. </para> <para> - Property files have to be ISO 8859-1 encoded, while the XML file can define its encoding. As a result it&#39;s easier for a human being to read a translation in XML instead of having to decode and encode the property file. + Property files have to be ISO 8859-1 encoded, while the XML file can define its encoding. As a result it's easier for a human being to read a translation in XML instead of having to decode and encode the property file. </para> <para> For more information refer to: <xref linkend="chap-Reference_Guide-XML_Resources_Bundles" /> @@ -189,7 +189,7 @@ </step> <step> <para> - In <filename>portlet.xml</filename>, add <parameter>Spanish</parameter> as a <emphasis role="bold">supported-locale</emphasis> (&#39;<emphasis role="bold">es</emphasis>&#39; is the two letter code for Spanish). The <emphasis role="bold">resource-bundle</emphasis> is already declared and is the same for all languages : + In <filename>portlet.xml</filename>, add <parameter>Spanish</parameter> as a <emphasis role="bold">supported-locale</emphasis> ('<emphasis role="bold">es</emphasis>' is the two letter code for Spanish). The <emphasis role="bold">resource-bundle</emphasis> is already declared and is the same for all languages : </para> <programlisting language="XML" role="XML">&#60;supported-locale&#62;en&#60;/supported-locale&#62; Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -55,7 +55,7 @@ <term>dir</term> <listitem> <para> - The string &#39;<emphasis role="bold">ltr</emphasis>&#39; if the orientation is LT or the string &#39;<emphasis role="bold">rtl</emphasis>&#39; if the orientation is RT. + The string '<emphasis role="bold">ltr</emphasis>' if the orientation is LT or the string '<emphasis role="bold">rtl</emphasis>' if the orientation is RT. </para> </listitem> </varlistentry> @@ -133,7 +133,7 @@ </para> <note> <para> - It is important to consider whether the image to be mirrored is symmetrical as this will impact it&#39;s final appearance. + It is important to consider whether the image to be mirrored is symmetrical as this will impact it's final appearance. </para> </note> <para> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -65,7 +65,7 @@ <note> <title>CSS Classes</title> <para> - The window decorators and the default portlet specification CSS classes should be considered separate types of skinning components, but they need to be included as part of the overall portal skin. The portal skin must include these components&#39; CSS classes or they will not be displayed correctly. + The window decorators and the default portlet specification CSS classes should be considered separate types of skinning components, but they need to be included as part of the overall portal skin. The portal skin must include these components' CSS classes or they will not be displayed correctly. </para> <para> A portlet skin does not need to be included as part of the portal skin and can be included within the portlets web application. @@ -108,7 +108,7 @@ <section id="sect-Reference_Guide-Skinning_the_Portal-Skins_in_Page_Markups"> <title>Skins in Page Markups</title> <para> - A JBoss Enterprise Portal Platform skin contains CSS styles for the portal&#39;s components but also shares components that may be reused in portlets. When JBoss Enterprise Portal Platform generates a portal page markup, it inserts stylesheet links in the page&#39;s <literal>head</literal> tag. + A JBoss Enterprise Portal Platform skin contains CSS styles for the portal's components but also shares components that may be reused in portlets. When JBoss Enterprise Portal Platform generates a portal page markup, it inserts stylesheet links in the page's <literal>head</literal> tag. </para> <para> There are two main types of CSS links that will appear in the <literal>head</literal> tag: a link to the portal skin CSS file and a link to the portlet skin CSS files. @@ -169,7 +169,7 @@ <section id="sect-Reference_Guide-The_Skin_Service-Resource_Request_Filter"> <title>Resource Request Filter</title> <para> - Because of JBoss Enterprise Portal Platform&#39;s Right-To-Left support, all CSS files need to be retrieved through a Servlet filter and the web application needs to be configured to activate this filter. This is already done for <literal>01eXoResources.war</literal> web application which contains the default skin. + Because of JBoss Enterprise Portal Platform's Right-To-Left support, all CSS files need to be retrieved through a Servlet filter and the web application needs to be configured to activate this filter. This is already done for <literal>01eXoResources.war</literal> web application which contains the default skin. </para> <para> Any new web applications containing skinning CSS files will need to have the following added to their <filename>web.xml</filename> : @@ -197,7 +197,7 @@ <term>gatein-resources.xml</term> <listitem> <para> - For the default portal skin, this file contains definitions for the portal skin, the window decorations that this skin provides and well as defining some javascript resources which are not related to the skin. The default portal skin doesn&#39;t directly define portlet skins, these should be provided by the portlets themselves. + For the default portal skin, this file contains definitions for the portal skin, the window decorations that this skin provides and well as defining some javascript resources which are not related to the skin. The default portal skin doesn't directly define portlet skins, these should be provided by the portlets themselves. </para> </listitem> </varlistentry> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -33,7 +33,7 @@ <section id="sect-Reference_Guide-XML_Resources_Bundles-XML_format"> <title>XML format</title> <para> - The XML format is very simple and has been developed based on the &#39;Don&#39;t Repeat Yourself&#39; (DRY) principle. Usually resource bundle keys are hierarchically defined and we can leverage the hierarchic nature of the XML for that purpose. Here is an example of turning a property file into an XML resource bundle file: + The XML format is very simple and has been developed based on the 'Don't Repeat Yourself' (DRY) principle. Usually resource bundle keys are hierarchically defined and we can leverage the hierarchic nature of the XML for that purpose. Here is an example of turning a property file into an XML resource bundle file: </para> <programlisting language="Java" role="Java"><xi:include href="../../extras/PortalDevelopment_XMLResourceBundles/default195.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -6,7 +6,7 @@ <section id="sect-Reference_Guide-Bridge_Configuration"> <title>Bridge Configuration</title> <para> - The 329 specification is aimed at making the developer&#39;s life as easy as possible with JSF+Portlet development. You will see below that there are minimal settings to getting any JSF web application up and running in the Portal environment. + The 329 specification is aimed at making the developer's life as easy as possible with JSF+Portlet development. You will see below that there are minimal settings to getting any JSF web application up and running in the Portal environment. </para> <!-- Commented as Maven Archetypes section removed from gettingstarted.xml <para> @@ -24,10 +24,10 @@ <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Configuration/default197.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - When <parameter>preserveActionParams</parameter> is set to <parameter>TRUE</parameter>, the bridge must maintain any request parameters assigned during the portlet&#39;s action request. + When <parameter>preserveActionParams</parameter> is set to <parameter>TRUE</parameter>, the bridge must maintain any request parameters assigned during the portlet's action request. </para> <para> - The request parameters are maintained in the <emphasis>&#34;bridge request scope&#34;</emphasis>. When this attribute is not present or is <parameter>FALSE</parameter> the action&#39;s request parameters are only maintained for the duration of the <emphasis>portlet request scope</emphasis>. + The request parameters are maintained in the <emphasis>&#34;bridge request scope&#34;</emphasis>. When this attribute is not present or is <parameter>FALSE</parameter> the action's request parameters are only maintained for the duration of the <emphasis>portlet request scope</emphasis>. </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Configuration/default198.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -9,7 +9,7 @@ JBoss Portlet Bridge not only gives you the ability to run JSF web applications in a portlet, but also gives you the benefit of running supported JBoss frameworks like <application>Seam</application> and <application>RichFaces</application>. </para> <section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Whats_New_in_2.0"> - <title>What&#39;s New in 2.0?</title> + <title>What's New in 2.0?</title> <section id="sect-Reference_Guide-Whats_New_in_2.0-Eventing"> <title>Eventing</title> <para> @@ -50,13 +50,13 @@ The bridge automates the processing of public render parameters. </para> <para> - A public render parameter can be mapped to an object&#39;s accessor (<literal>get</literal>/<literal>set</literal> method) designed to handle a String representation of the value via a <application>Faces</application> <literal>ValueExpression</literal>. + A public render parameter can be mapped to an object's accessor (<literal>get</literal>/<literal>set</literal> method) designed to handle a String representation of the value via a <application>Faces</application> <literal>ValueExpression</literal>. </para> <para> - When a new public render parameter value is received in a request, the bridge sets the value by calling the <literal>ValueExpression</literal>&#39;s <parameter>setValue()</parameter>. + When a new public render parameter value is received in a request, the bridge sets the value by calling the <literal>ValueExpression</literal>'s <parameter>setValue()</parameter>. </para> <para> - At the end of a request, if the current value of any mapped public render parameter doesn&#39;t match the current incoming value, the bridge sets the new value in an outgoing public render parameter (if feasible in the given phase). + At the end of a request, if the current value of any mapped public render parameter doesn't match the current incoming value, the bridge sets the new value in an outgoing public render parameter (if feasible in the given phase). </para> <para> See <xref linkend="sect-Reference_Guide-Portlet_2.0_Coordination-Public_Render_Parameters" /> for details and examples. @@ -83,7 +83,7 @@ For example, the <literal>PortalIdentity</literal> <application>Seam</application> component allows you to instantly have Single Sign-On (SSO) between <application>Seam</application> and <application>GateIn</application> or <application>JBoss Enterprise Portal Platform</application>. </para> <para> - This extension is configured in your <application>Seam</application> application&#39;s <filename>components.xml</filename> file as follows. + This extension is configured in your <application>Seam</application> application's <filename>components.xml</filename> file as follows. </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_GettingStarted/default218.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -14,7 +14,7 @@ When your application uses request attributes on a per request basis and you do not want that particular attribute to be managed in the extended bridge request scope, you must use the following configuration in your <filename>faces-config.xml</filename>. </para> <para> - In the code sample below you can see that any attribute namespaced as <literal>foo.bar</literal> or any attribute beginning with <literal>foo.baz(wild-card)</literal> will be excluded from the bridge request scope and only be used per that application&#39;s request. + In the code sample below you can see that any attribute namespaced as <literal>foo.bar</literal> or any attribute beginning with <literal>foo.baz(wild-card)</literal> will be excluded from the bridge request scope and only be used per that application's request. </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Portlet_Development/default223.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -27,7 +27,7 @@ A <literal>PortletMode</literal> represents a distinct render path within an application. There are three standard modes: <emphasis>view</emphasis>, <emphasis>edit</emphasis>, and <emphasis>help</emphasis>. </para> <para> - The bridge&#39;s <literal>ExternalContext.encodeActionURL</literal> recognizes the query string parameter <literal>javax.portlet.faces.PortletMode</literal> and uses this parameter&#39;s value to set the portlet mode on the underlying portlet <literal>actionURL</literal> or response. + The bridge's <literal>ExternalContext.encodeActionURL</literal> recognizes the query string parameter <literal>javax.portlet.faces.PortletMode</literal> and uses this parameter's value to set the portlet mode on the underlying portlet <literal>actionURL</literal> or response. </para> <para> Once processed it then removes this parameter from the query string. This means the following navigation rule causes one to render the \edit.jspx viewId in the portlet edit mode: @@ -38,9 +38,9 @@ <section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Navigating_to_a_modes_last_viewId"> - <title>Navigating to a mode&#39;s last viewId</title> + <title>Navigating to a mode's last viewId</title> <para> - By default a mode change will start in the mode&#39;s default view without any (prior) existing state. One common portlet pattern when returning to a mode left after entering another mode (e.g.. view -&#62; edit -&#62; view) is to return to the last view (and state) of this origin mode. + By default a mode change will start in the mode's default view without any (prior) existing state. One common portlet pattern when returning to a mode left after entering another mode (e.g.. view -&#62; edit -&#62; view) is to return to the last view (and state) of this origin mode. </para> <para> The bridge will explicitly encode the necessary information so that when returning to a prior mode it can target the appropriate view and restore the appropriate state. @@ -69,7 +69,7 @@ <programlisting language="XML" role="XML">/viewId?javax.portlet.faces.PortletMode=view&amp;.... </programlisting> <para> - Without wild-carding, when a subsequent navigation occurs from this new view, the navigation rules wouldn&#39;t resolve because there wouldn&#39;t be an exact match. Likewise, the above <literal>edit.jspx</literal> + Without wild-carding, when a subsequent navigation occurs from this new view, the navigation rules wouldn't resolve because there wouldn't be an exact match. Likewise, the above <literal>edit.jspx</literal> </para> <programlisting language="XML" role="XML">&#60;from-view-id&#62; @@ -194,7 +194,7 @@ Then, in your JSP or Facelets page, you can use: </para> -<programlisting language="XML" role="XML">#{httpSessionScope[&#39;your parameter name&#39;]} +<programlisting language="XML" role="XML">#{httpSessionScope['your parameter name']} </programlisting> <para> <note> Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml =================================================================== --- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -326,7 +326,7 @@ </callout> <callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.portletinfo"> <para> - When rendered, the portlet&#39;s title is displayed as the header in the portlet window, unless it is overridden programmatically. In the example above the title would be <literal>Simplest Hello World Portlet</literal> . + When rendered, the portlet's title is displayed as the header in the portlet window, unless it is overridden programmatically. In the example above the title would be <literal>Simplest Hello World Portlet</literal> . </para> </callout> </calloutlist> @@ -472,7 +472,7 @@ As well as the <literal>VIEW</literal> portlet mode, the specification defines two other modes; <literal>EDIT</literal> and <literal>HELP</literal>. </para> <para> - These modes need to be defined in the <filename>portlet.xml</filename> descriptor. This will enable the corresponding buttons on the portlet&#39;s window. + These modes need to be defined in the <filename>portlet.xml</filename> descriptor. This will enable the corresponding buttons on the portlet's window. </para> <para> The generic portlet that is inherited dispatches the different views to the methods: <literal>doView</literal> , <literal>doHelp</literal> and <literal>doEdit</literal>. @@ -595,7 +595,7 @@ <section id="sect-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge_"> <title>JSF example using the JBoss Portlet Bridge </title> <para> - In order to write a portlet using JSF a &#39;bridge&#39; is needed. This software allows developers to write a portlet application as if it was a JSF application. The bridge then negotiates the interactions between the two layers. + In order to write a portlet using JSF a 'bridge' is needed. This software allows developers to write a portlet application as if it was a JSF application. The bridge then negotiates the interactions between the two layers. </para> <para> An example using the JBoss Portlet Bridge is available in the <filename>/jboss-epp-&lt;VERSION&gt;-src/portal/examples/portlets/</filename> directory of the JBoss Enterprise Portal Platform sources package or the <filename>/jboss-epp-&lt;VERSION&gt;-docs/epp-doc/examples/portlets</filename> directory of the documentation package. The configuration is slightly different from a JSP application. This example can be used as a base to configure instead of creating a new application. @@ -630,17 +630,17 @@ </callout> <callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.view"> <para> - This is a mandatory parameter to define what&#39;s the default page to display. + This is a mandatory parameter to define what's the default page to display. </para> </callout> <callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.edit"> <para> - This parameter defines which page to display on the &#39;edit&#39; mode. + This parameter defines which page to display on the 'edit' mode. </para> </callout> <callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.help"> <para> - This parameter defines which page to display on the &#39;help&#39; mode. + This parameter defines which page to display on the 'help' mode. </para> </callout> </calloutlist> Modified: epp/docs/branches/5.1/Release_Notes/en-US/Common_Content/Conventions.xml =================================================================== --- epp/docs/branches/5.1/Release_Notes/en-US/Common_Content/Conventions.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/Release_Notes/en-US/Common_Content/Conventions.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -163,7 +163,7 @@ <important> <title>Important</title> <para> - Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' won't cause data loss but may cause irritation and frustration. + Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' will not cause data loss but may cause irritation and frustration. </para> </important> Modified: epp/docs/branches/5.1/User_Guide/en-US/Common_Content/Conventions.xml =================================================================== --- epp/docs/branches/5.1/User_Guide/en-US/Common_Content/Conventions.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.1/User_Guide/en-US/Common_Content/Conventions.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -152,7 +152,7 @@ <important> <title>Important</title> <para> - Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' won't cause data loss but may cause irritation and frustration. + Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' will not cause data loss but may cause irritation and frustration. </para> </important> <warning> Modified: epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml =================================================================== --- epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -155,7 +155,7 @@ </formalpara> <para> <screen> -mysqladmin -u root password &#39;<replaceable>new-root-user-password</replaceable>&#39; +mysqladmin -u root password '<replaceable>new-root-user-password</replaceable>' </screen> </para> <orderedlist> @@ -227,18 +227,18 @@ </para> <para> <screen> -mysql&gt; GRANT ALL PRIVILEGES ON gateinjcr.* TO &#39;<replaceable>gateinuser</replaceable>&#39;@&#39;localhost&#39; -IDENTIFIED BY &#39;<replaceable>gateinpassword</replaceable>&#39; WITH GRANT OPTION; +mysql&gt; GRANT ALL PRIVILEGES ON gateinjcr.* TO '<replaceable>gateinuser</replaceable>'@'localhost' +IDENTIFIED BY '<replaceable>gateinpassword</replaceable>' WITH GRANT OPTION; </screen> <screen> -mysql&gt; GRANT ALL PRIVILEGES ON gateinidm.* TO &#39;<replaceable>gateinuser</replaceable>&#39;@&#39;localhost&#39; -IDENTIFIED BY &#39;<replaceable>gateinpassword</replaceable>&#39; WITH GRANT OPTION; +mysql&gt; GRANT ALL PRIVILEGES ON gateinidm.* TO '<replaceable>gateinuser</replaceable>'@'localhost' +IDENTIFIED BY '<replaceable>gateinpassword</replaceable>' WITH GRANT OPTION; </screen> </para> <!-- <note><title>Note: Changed password?</title> <para> - If you changed the portal user&#39;s password, remember to also change the password in the MySQL Datasource descriptor. + If you changed the portal user's password, remember to also change the password in the MySQL Datasource descriptor. </para> </note> --> Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Getting_Started.xml =================================================================== --- epp/docs/branches/5.2/Installation_Guide/en-US/Getting_Started.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Installation_Guide/en-US/Getting_Started.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -548,7 +548,7 @@ <title>Installing and Configuring JDK 6.0 on a generic Linux platform</title> <listitem> <para> - Download the Java 2 Platform, Standard Edition (J2SE) Development Kit (JDK) 6.0 from Sun&#39;s website: <ulink url="http://java.sun.com/javase/downloads/index.jsp#need">&l...;. + Download the Java 2 Platform, Standard Edition (J2SE) Development Kit (JDK) 6.0 from Sun's website: <ulink url="http://java.sun.com/javase/downloads/index.jsp#need">&l...;. </para> </listitem> <listitem> @@ -620,7 +620,7 @@ As root, type the following command at the shell prompt and you should see something like this: </para> <programlisting>[root@vsr ~]$ /usr/sbin/alternatives --config java -There are 2 programs which provide &#39;java&#39;. +There are 2 programs which provide 'java'. Selection Command ----------------------------------------------- 1 /usr/lib/jvm/jre-1.4.2-gcj/bin/java @@ -629,7 +629,7 @@ </programlisting> <para> - Make sure the Sun version - <literal>jre-1.6.0-sun</literal> in this case - is selected (marked with a &#39;+&#39; in the output), or select it by entering its number as prompted. + Make sure the Sun version - <literal>jre-1.6.0-sun</literal> in this case - is selected (marked with a '+' in the output), or select it by entering its number as prompted. </para> </listitem> <listitem> @@ -638,7 +638,7 @@ </para> <programlisting> [root@vsr ~]$ /usr/sbin/alternatives --config javac -There are 1 programs which provide &#39;javac&#39;. +There are 1 programs which provide 'javac'. Selection Command ----------------------------------------------- *+ 1 /usr/lib/jvm/java-1.6.0-sun/bin/javac @@ -646,7 +646,7 @@ </programlisting> <programlisting> [root@vsr ~]$ /usr/sbin/alternatives --config java_sdk_1.6.0 -There are 1 programs which provide &#39;java_sdk_1.6.0&#39;. +There are 1 programs which provide 'java_sdk_1.6.0'. Selection Command ----------------------------------------------- *+ 1 /usr/lib/jvm/java-1.6.0-sun @@ -675,7 +675,7 @@ <title>Installing and Configuring JDK 6.0 on Microsoft Windows</title> <listitem> <para> - Download the Java 2 Platform, Standard Edition (J2SE) Development Kit (JDK) 6.0 from Sun&#39;s website: <ulink url="http://java.sun.com/javase/downloads/index.jsp#need">&l...;. + Download the Java 2 Platform, Standard Edition (J2SE) Development Kit (JDK) 6.0 from Sun's website: <ulink url="http://java.sun.com/javase/downloads/index.jsp#need">&l...;. </para> </listitem> <listitem> Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Launching.xml =================================================================== --- epp/docs/branches/5.2/Installation_Guide/en-US/Launching.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Installation_Guide/en-US/Launching.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -91,7 +91,7 @@ </procedure> <para> - An alternative shutdown method is to &#39;kill&#39; the process running the product. This can be done by: + An alternative shutdown method is to 'kill' the process running the product. This can be done by: </para> <orderedlist> <listitem> @@ -101,14 +101,14 @@ </listitem> <listitem> <para> - Issuing the following command with the product&#39;s process ID (<literal>PID</literal>) in another terminal instance: + Issuing the following command with the product's process ID (<literal>PID</literal>) in another terminal instance: <programlisting><command>kill <replaceable>PID</replaceable></command> </programlisting> </para> </listitem> <listitem> <para> - Using your operating system&#39;s native System Monitor to shut the process down graphically. + Using your operating system's native System Monitor to shut the process down graphically. </para> </listitem> </orderedlist> Modified: epp/docs/branches/5.2/Installation_Guide/en-US/fallback_content/Conventions.xml =================================================================== --- epp/docs/branches/5.2/Installation_Guide/en-US/fallback_content/Conventions.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Installation_Guide/en-US/fallback_content/Conventions.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -151,7 +151,7 @@ <important> <title>Important</title> <para> - Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' won't cause data loss but may cause irritation and frustration. + Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' will not cause data loss but may cause irritation and frustration. </para> </important> <warning> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/Common_Content/Conventions.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/Common_Content/Conventions.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/Common_Content/Conventions.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -70,7 +70,7 @@ The above text includes application names; system-wide menu names and items; application-specific menu names; and buttons and text found within a GUI interface, all presented in proportional bold and all distinguishable by context. </para> <para> - Note the <guimenu>&#62;</guimenu> shorthand used to indicate traversal through a menu and its sub-menus. This avoids difficult-to-follow phrasing such as &#39;Select <guimenuitem>Mouse</guimenuitem> from the <guimenu>Preferences</guimenu> sub-menu in the <guimenu>System</guimenu> menu of the main menu bar&#39;. + Note the <guimenu>&#62;</guimenu> shorthand used to indicate traversal through a menu and its sub-menus. This avoids difficult-to-follow phrasing such as 'Select <guimenuitem>Mouse</guimenuitem> from the <guimenu>Preferences</guimenu> sub-menu in the <guimenu>System</guimenu> menu of the main menu bar'. </para> <para> <command><replaceable>Mono-spaced Bold Italic</replaceable></command> or <application><replaceable>Proportional Bold Italic</replaceable></application> @@ -131,7 +131,7 @@ EchoHome home = (EchoHome) ref; Echo echo = home.create(); System.out.println(&#34;Created Echo&#34;); -System.out.println(&#34;Echo.echo(&#39;Hello&#39;) = &#34; + echo.echo(&#34;Hello&#34;)); +System.out.println(&#34;Echo.echo('Hello') = &#34; + echo.echo(&#34;Hello&#34;)); } } </programlisting> @@ -152,7 +152,7 @@ <important> <title>Important</title> <para> - Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled &#39;Important&#39; won&#39;t cause data loss but may cause irritation and frustration. + Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' will not cause data loss but may cause irritation and frustration. </para> </important> <warning> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/Feedback.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/Feedback.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/Feedback.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -13,7 +13,7 @@ If you find a typographical error in this manual, or if you have thought of a way to make this manual better, we would love to hear from you! Please submit a report in Bugzilla: <ulink url="http://bugzilla.redhat.com/bugzilla/">http://bugzilla.r... against the product <application>JBoss Enterprise Portal Platform</application>. </para> <para> - When submitting a bug report, be sure to mention the manual&#39;s identifier: <citetitle>&BOOKID;</citetitle> + When submitting a bug report, be sure to mention the manual's identifier: <citetitle>&BOOKID;</citetitle> </para> <para> If you have a suggestion for improving the documentation, try to be as specific as possible when describing it. If you have found an error, please include the section number and some of the surrounding text so we can find it easily. Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/Foundations.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -86,7 +86,7 @@ <section id="sect-Reference_Guide-Configuration_syntax-External_Plugins"> <title>External Plug-ins</title> <para> - The eXo Kernel supports non-component objects that can be configured, instantiated, and injected into registered components using method calls. This &#39;<emphasis>plugin</emphasis>&#39; method allows portal extensions to add additional configurations to core services. + The eXo Kernel supports non-component objects that can be configured, instantiated, and injected into registered components using method calls. This '<emphasis>plugin</emphasis>' method allows portal extensions to add additional configurations to core services. </para> <para> An external plugin is defined by using the <literal>&#60;external-component-plugin&#62;</literal> wrapper element which contains one or more <literal>&#60;component-plugin&#62;</literal> definitions. @@ -117,7 +117,7 @@ The included files must be valid xml files; they cannot be fragments of text. </para> <para> - Below is an example <filename>configuration.xml</filename> that &#39;outsources&#39; its content into several files: + Below is an example <filename>configuration.xml</filename> that 'outsources' its content into several files: </para> <programlistingco> <areaspec> @@ -128,7 +128,7 @@ <calloutlist> <callout arearefs="area-Reference_Guide-Configuration_syntax-Includes_and_special_URLs-url_schema"> <para> - This line is being used to reference another configuration file. The <code>war:</code> URL schema indicates that the following path is to be resolved relative to the current <literal>PortalContainer</literal>&#39;s servlet context resource path, starting with <emphasis role="bold">WEB-INF</emphasis> as a root. + This line is being used to reference another configuration file. The <code>war:</code> URL schema indicates that the following path is to be resolved relative to the current <literal>PortalContainer</literal>'s servlet context resource path, starting with <emphasis role="bold">WEB-INF</emphasis> as a root. </para> </callout> </calloutlist> @@ -143,7 +143,7 @@ Through the extension mechanism the servlet context used for resource loading is a <emphasis role="bold">unified servlet context</emphasis> (this is explained in a later section). </para> <para> - To have an &#39;include&#39; path resolved relative to current classpath (context classloader), use a <code>&#39;jar:&#39;</code> URL schema. + To have an 'include' path resolved relative to current classpath (context classloader), use a <code>'jar:'</code> URL schema. </para> </section> @@ -178,7 +178,7 @@ Service components that form the JBoss Enterprise Portal Platform infrastructure use <parameter>InitParams</parameter> elements to configure themselves. A component can have one instance of <parameter>InitParams</parameter> injected at most. </para> <para> - If the service component&#39;s constructor takes <parameter>InitParams</parameter> as any of the parameters it will automatically be injected at component instantiation time. + If the service component's constructor takes <parameter>InitParams</parameter> as any of the parameters it will automatically be injected at component instantiation time. </para> <para> The XML configuration for a service component that expects an <parameter>InitParams</parameter> element must have an <parameter>&#60;init-params&#62;</parameter> element present, however this element can be left empty. @@ -247,7 +247,7 @@ The following section has an example of specifying a field of with a <literal>Collection</literal> type. </para> <para> - The <parameter>InitParams</parameter> structure (the names and types of entries) is specific for each service, as it is the code inside a service components&#39; class that defines which entry names to look up and what types it expects to find. + The <parameter>InitParams</parameter> structure (the names and types of entries) is specific for each service, as it is the code inside a service components' class that defines which entry names to look up and what types it expects to find. </para> </section> @@ -350,7 +350,7 @@ The <emphasis role="bold">Extension mechanism</emphasis> makes it possible to override portal resources in a way similar to hardware plug-and-play functionalities. </para> <para> - Customizations can be implemented without unpacking and repacking the original portal <code>.war</code> archives by adding a <code>.war</code> archive to the resources and configuring its position in the portal&#39;s classpath. Custom <code>.war</code> archives can be created with new resources that override the resources in the original archive. + Customizations can be implemented without unpacking and repacking the original portal <code>.war</code> archives by adding a <code>.war</code> archive to the resources and configuring its position in the portal's classpath. Custom <code>.war</code> archives can be created with new resources that override the resources in the original archive. </para> <para> These archives, packaged for use through the extension mechanism, are called <emphasis role="bold">portal extensions</emphasis>. @@ -369,15 +369,15 @@ </step> <step> <para> - Add the application&#39;s servlet context name to the <literal>PortalContainerDefinition</literal>&#39;s list of dependencies. This must be done for each portal container that you want to have access to the new application. + Add the application's servlet context name to the <literal>PortalContainerDefinition</literal>'s list of dependencies. This must be done for each portal container that you want to have access to the new application. </para> <para> - The application&#39;s position in these lists will dictate its priority when the portal loads resources. The later your application appears in the list, the higher its resource priority will be. + The application's position in these lists will dictate its priority when the portal loads resources. The later your application appears in the list, the higher its resource priority will be. </para> </step> <step> <para> - At this point your new web archive will be on both the portal&#39;s unified classpath and unified servlet context resource path. + At this point your new web archive will be on both the portal's unified classpath and unified servlet context resource path. </para> </step> </procedure> @@ -418,7 +418,7 @@ A servlet in this instance should extend the <literal>org.exoplatform.container.web.AbstractHttpServlet</literal> class so as to properly initialize the current <literal>PortalContainer</literal>. </para> <para> - This will also set the current thread&#39;s context classloader to one that looks for resources in associated web applications in the order specified by the <emphasis role="bold">dependencies</emphasis> configuration (as seen in <xref linkend="sect-Reference_Guide-Foundations-The_Extension_Mechanism_and_Portal_Extensions" />). + This will also set the current thread's context classloader to one that looks for resources in associated web applications in the order specified by the <emphasis role="bold">dependencies</emphasis> configuration (as seen in <xref linkend="sect-Reference_Guide-Foundations-The_Extension_Mechanism_and_Portal_Extensions" />). </para> <para> Filter classes need to extend the <literal>org.exoplatform.container.web.AbstractFilter</literal>. @@ -433,7 +433,7 @@ <programlisting language="Java" role="Java"><xi:include href="../../extras/Advanced_Development_Foundations/default9.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <note> <para> - This ensures that <literal>AbstractHttpServlet</literal>&#39;s <literal>service()</literal> interception is not overwritten. + This ensures that <literal>AbstractHttpServlet</literal>'s <literal>service()</literal> interception is not overwritten. </para> </note> <para> @@ -450,7 +450,7 @@ <programlisting language="Java" role="Java"><xi:include href="../../extras/Advanced_Development_Foundations/default11.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - If this method returns <emphasis>true</emphasis> the current thread&#39;s context classloader is set up according to the <emphasis role="bold">dependencies</emphasis> configuration and availability of the associated web applications. + If this method returns <emphasis>true</emphasis> the current thread's context classloader is set up according to the <emphasis role="bold">dependencies</emphasis> configuration and availability of the associated web applications. </para> <para> If it returns <emphasis>false</emphasis> the standard application separation rules are used for resource loading (effectively turning off the extension mechanism). Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -27,11 +27,11 @@ <term>Repository</term> <listitem> <para> - A repository is a form of data storage device. A &#39;repository&#39; differs from a &#39;database&#39; in the nature of the information contained. While a database holds hard data in rigid tables, a repository may access the data on a database by using less rigid <emphasis>meta</emphasis>-data. In this sense a repository operates as an &#39;interpreter&#39; between the database(s) and the user. + A repository is a form of data storage device. A 'repository' differs from a 'database' in the nature of the information contained. While a database holds hard data in rigid tables, a repository may access the data on a database by using less rigid <emphasis>meta</emphasis>-data. In this sense a repository operates as an 'interpreter' between the database(s) and the user. </para> <note> <para> - The data model for the interface (the repository) is rarely the same as the data model used by the repository&#39;s underlying storage subsystems (such as a database), however the repository is able to make persistent data changes in the storage subsystem. + The data model for the interface (the repository) is rarely the same as the data model used by the repository's underlying storage subsystems (such as a database), however the repository is able to make persistent data changes in the storage subsystem. </para> </note> </listitem> @@ -40,7 +40,7 @@ <term>Workspace</term> <listitem> <para> - The eXo JCR uses &#39;workspaces&#39; as the main data abstraction in its data model. The content is stored in a workspace as a hierarchy of <emphasis>items</emphasis> and each workspace has its own hierarchy of items. + The eXo JCR uses 'workspaces' as the main data abstraction in its data model. The content is stored in a workspace as a hierarchy of <emphasis>items</emphasis> and each workspace has its own hierarchy of items. </para> <para> Repositories access one or more workspaces. Persistent JCR workspaces consist of a directed acyclic graph of <emphasis>items</emphasis> where the edges represent the parent-child relation. Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -610,7 +610,7 @@ <section id="sect-Reference_Guide-Simple_and_Complex_queries-Notes_for_Microsoft_Windows_users"> <title>Notes for Microsoft Windows users</title> <para> - The current configuration of eXo JCR uses Apache DBCP connection pool (<classname>org.apache.commons.dbcp.BasicDataSourceFactory</classname>). It&#39;s possible to set a big value for maxActive parameter in <filename>configuration.xml</filename>. That means usage of lots of TCP/IP ports from a client machine inside the pool (i.e. JDBC driver). As a result the data container can throw exceptions like &#34;Address already in use&#34;. To solve this problem you have to configure the client&#39;s machine networking software for the usage of shorter timeouts for opened TCP/IP ports. + The current configuration of eXo JCR uses Apache DBCP connection pool (<classname>org.apache.commons.dbcp.BasicDataSourceFactory</classname>). It's possible to set a big value for maxActive parameter in <filename>configuration.xml</filename>. That means usage of lots of TCP/IP ports from a client machine inside the pool (i.e. JDBC driver). As a result the data container can throw exceptions like &#34;Address already in use&#34;. To solve this problem you have to configure the client's machine networking software for the usage of shorter timeouts for opened TCP/IP ports. </para> <para> Microsoft Windows has <parameter>MaxUserPort</parameter>, <parameter>TcpTimedWaitDelay</parameter> registry keys in the node <parameter>HKEY_LOCAL_MACHINESYSTEMCurrentControlSetServicesTcpipParameters</parameter>, by default these keys are unset, set each one with values like these: Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -316,7 +316,7 @@ <calloutlist> <callout arearefs="area-Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-cache.jdbc.templates"> <para> - All the configurable parameters in this file are populated with templates which will be replaced with LockManager&#39;s configuration parameters. + All the configurable parameters in this file are populated with templates which will be replaced with LockManager's configuration parameters. </para> </callout> </calloutlist> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -283,7 +283,7 @@ The corresponding CSV files are named <filename>Statistics<replaceable>${interface-name}</replaceable>-<replaceable>${creation-timestamp}</replaceable>.csv</filename>. For more details about how the CSV files are managed please refer to the section dedicated to the statistics manager. </para> <para> - The format of each column header is <replaceable>${method-alias}</replaceable>-<replaceable>${metric-alias}</replaceable>. The method alias will be of type <replaceable>${method-name}</replaceable> (a list of parameter types separated by &#39;<emphasis role="bold">;</emphasis>&#39; to be compatible with the CSV format). + The format of each column header is <replaceable>${method-alias}</replaceable>-<replaceable>${metric-alias}</replaceable>. The method alias will be of type <replaceable>${method-name}</replaceable> (a list of parameter types separated by '<emphasis role="bold">;</emphasis>' to be compatible with the CSV format). </para> <para> The metric aliases are described in <xref linkend="sect-Reference_Guide-eXo_JCR_statistics-Statistics_Manager" />. Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -8,7 +8,7 @@ <section id="sect-Reference_Guide-TransactionManagerLookup-Configuration"> <title>Configuration</title> <para> - It&#39;s JBossCache class registered as eXo container component in configuration.xml file. + It's JBossCache class registered as eXo container component in configuration.xml file. </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_transaction-manager-lookup/default90.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -138,7 +138,7 @@ <term>defaultGroupType</term> <listitem> <para> - The name of the PicketLink IDM GroupType that will be used to store groups. The default is &#39;<literal>GTN_GROUP_TYPE</literal>&#39;. + The name of the PicketLink IDM GroupType that will be used to store groups. The default is '<literal>GTN_GROUP_TYPE</literal>'. </para> </listitem> </varlistentry> @@ -146,7 +146,7 @@ <term>rootGroupName</term> <listitem> <para> - The name of the PicketLink IDM Group that will be used as a root parent. The default is &#39;<literal>GTN_ROOT_GROUP</literal>&#39; + The name of the PicketLink IDM Group that will be used as a root parent. The default is '<literal>GTN_ROOT_GROUP</literal>' </para> </listitem> </varlistentry> @@ -162,7 +162,7 @@ <term>useParentIdAsGroupType</term> <listitem> <para> - This parameter stores the parent ID path as a group type in PicketLink IDM for any IDs not mapped with a specific type in &#39;<literal>groupTypeMappings</literal>&#39;. If this option is set to <emphasis>false</emphasis>, and no mappings are provided under &#39;<literal>groupTypeMappings</literal>&#39;, then only one group with the given name can exist in the JBoss Enterprise Portal Platform group tree. + This parameter stores the parent ID path as a group type in PicketLink IDM for any IDs not mapped with a specific type in '<literal>groupTypeMappings</literal>'. If this option is set to <emphasis>false</emphasis>, and no mappings are provided under '<literal>groupTypeMappings</literal>', then only one group with the given name can exist in the JBoss Enterprise Portal Platform group tree. </para> </listitem> </varlistentry> @@ -170,7 +170,7 @@ <term>pathSeparator</term> <listitem> <para> - When &#39;<literal>userParentIdAsGroupType</literal>&#39; is set to <emphasis>true</emphasis>, this value will be used to replace all &#34;/&#34; characters in IDs. The &#34;/&#34; character is not allowed to be used in group type name in PicketLink IDM. + When '<literal>userParentIdAsGroupType</literal>' is set to <emphasis>true</emphasis>, this value will be used to replace all &#34;/&#34; characters in IDs. The &#34;/&#34; character is not allowed to be used in group type name in PicketLink IDM. </para> </listitem> </varlistentry> @@ -200,7 +200,7 @@ <term>forceMembershipOfMappedTypes</term> <listitem> <para> - Groups stored in PicketLink IDM with a type mapped in &#39;<literal>groupTypeMappings</literal>&#39; will automatically be members under the mapped parent. Group relationships linked by PicketLink IDM group association will not be necessary. + Groups stored in PicketLink IDM with a type mapped in '<literal>groupTypeMappings</literal>' will automatically be members under the mapped parent. Group relationships linked by PicketLink IDM group association will not be necessary. </para> <para> This parameter can be set to <emphasis>false</emphasis> if all groups are added via JBoss Enterprise Portal Platform APIs. This may be useful with LDAP configuration as, when set to true, it will make every entry added to LDAP appear in JBoss Enterprise Portal Platform. This, however, is not true for entries added via JBoss Enterprise Portal Platform management UI. Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/OrganizationAPI.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -21,7 +21,7 @@ <term>User Profile</term> <listitem> <para> - The <literal>User Profile</literal> component contains extra information about a user, such as user&#39;s personal information, and business information. You can also add additional information about a user if your application requires it. + The <literal>User Profile</literal> component contains extra information about a user, such as user's personal information, and business information. You can also add additional information about a user if your application requires it. </para> </listitem> </varlistentry> @@ -48,7 +48,7 @@ The <literal>Membership</literal> component connects a User, a Group and a Membership Type. </para> <para> - A user can have one or more memberships within a group. For example: <emphasis role="bold">User A</emphasis> can have the &#39;<emphasis>member</emphasis>&#39; and &#39;<emphasis>admin</emphasis>&#39; memberships in group <emphasis role="bold">/user</emphasis>. A user belongs to a group if he has at least one membership in that group. + A user can have one or more memberships within a group. For example: <emphasis role="bold">User A</emphasis> can have the '<emphasis>member</emphasis>' and '<emphasis>admin</emphasis>' memberships in group <emphasis role="bold">/user</emphasis>. A user belongs to a group if he has at least one membership in that group. </para> </listitem> </varlistentry> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/PredefinedUserConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -83,12 +83,12 @@ The plugin type <literal>org.exoplatform.services.organization.impl.NewUserEventListener</literal> specifies which groups all newly created users should become members of. </para> <para> - It specifies the group memberships and the membership types to use (while a <emphasis>group</emphasis> is just a set of users, a membership <emphasis>type</emphasis> represents a user&#39;s role within a group). It also specifies a list of users that should not be processed (such as administrative users like &#39;<literal>root</literal>&#39;). + It specifies the group memberships and the membership types to use (while a <emphasis>group</emphasis> is just a set of users, a membership <emphasis>type</emphasis> represents a user's role within a group). It also specifies a list of users that should not be processed (such as administrative users like '<literal>root</literal>'). </para> <note> <title>Terminology</title> <para> - The terms &#39;<emphasis role="bold">membership</emphasis>&#39; and &#39;<emphasis role="bold">membership type</emphasis>&#39; refer to the same thing, and are used interchangeably. + The terms '<emphasis role="bold">membership</emphasis>' and '<emphasis role="bold">membership type</emphasis>' refer to the same thing, and are used interchangeably. </para> </note> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -158,7 +158,7 @@ </para> <note> <para> - At this stage the login functionality won&#39;t be available. + At this stage the login functionality will not be available. </para> </note> <mediaobject> @@ -183,7 +183,7 @@ <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default105.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - There&#39;s a line comment already in this source file to assist you. + There's a line comment already in this source file to assist you. </para> </step> <step> @@ -215,14 +215,14 @@ <title>Redirect to CAS</title> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default106.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> </step> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default107.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -381,14 +381,14 @@ <title>Setup the portal to redirect to JOSSO</title> <step> <para> - In the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file modify the &#39;Sign In&#39; link as follows: + In the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file modify the 'Sign In' link as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default112.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> </step> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default113.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -627,7 +627,7 @@ </step> <step> <para> - Repeat step 7 for the &#39;<literal>gatein</literal>&#39; realm as well. + Repeat step 7 for the '<literal>gatein</literal>' realm as well. </para> </step> </procedure> @@ -681,14 +681,14 @@ <title>Setup the portal to redirect to OpenSSO</title> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtml</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default119.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> </step> <step> <para> - Modify the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: + Modify the '<emphasis role="bold">Sign In</emphasis>' link in the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file as follows: </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default120.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -773,12 +773,12 @@ <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default124.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - The &#39;<literal>keyTab</literal>&#39; value should point to the keytab file that was generated by the <literal>kadmin</literal> Kerberos tool. See the <ulink type="http" url="http://community.jboss.org/wiki/SettingupyourKerberosDevelopmen... up your Kerberos Development Environment</ulink> guide for more details. + The '<literal>keyTab</literal>' value should point to the keytab file that was generated by the <literal>kadmin</literal> Kerberos tool. See the <ulink type="http" url="http://community.jboss.org/wiki/SettingupyourKerberosDevelopmen... up your Kerberos Development Environment</ulink> guide for more details. </para> </step> <step> <para> - Extend the core authentication mechanisms to support SPNEGO. Under <filename>deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml</filename>, add a &#39;<literal>SPNEGO</literal>&#39; authenticators property + Extend the core authentication mechanisms to support SPNEGO. Under <filename>deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml</filename>, add a '<literal>SPNEGO</literal>' authenticators property </para> <programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_SSO/default125.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -820,12 +820,12 @@ </step> <step> <para> - Edit the &#39;<emphasis role="bold">Sign In</emphasis>&#39; link in <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</filename> to match the following: + Edit the '<emphasis role="bold">Sign In</emphasis>' link in <filename><replaceable>JBOSS_HOME</replaceable>/jboss-as/server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/web.war/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</filename> to match the following: </para> <programlisting language="Java" role="Java"><xi:include href="../../extras/Authentication_Identity_SSO/default129.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - This modifies the Portal&#39;s &#39;<emphasis role="bold">Sign In</emphasis>&#39; link to perform SPNEGO authentication. + This modifies the Portal's '<emphasis role="bold">Sign In</emphasis>' link to perform SPNEGO authentication. </para> </step> <step> @@ -849,7 +849,7 @@ </procedure> <para> - Clicking the &#39;Sign In&#39; link on the JBoss Enterprise Portal Platform should automatically sign the &#39;demo&#39; user into the portal. + Clicking the 'Sign In' link on the JBoss Enterprise Portal Platform should automatically sign the 'demo' user into the portal. </para> </section> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/Configuration/DatabaseConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -47,22 +47,22 @@ In the case of HSQL the databases are created automatically. For any other database you will need to create a database named jdbcjcr_portal (and &#34;jdbcjcr_sample-portal&#34; if you have gatein-sample-portal.ear in <filename><replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy</filename>). </para> <para> - Note that some databases don&#39;t accept &#39;-&#39; in the database name, so you may have to remove <filename><replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-sample-portal.ear</filename>) + Note that some databases don't accept '-' in the database name, so you may have to remove <filename><replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-sample-portal.ear</filename>) </para> <para> Make sure the user has rights to create tables on jdbcjcr_portal, and to update them as they will be automatically created during the first start up . </para> <para> - Also add your database&#39;s JDBC driver into the classpath - you can put it in <replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/lib (or <replaceable>TOMCAT_HOME</replaceable>/lib, if you are running on Tomcat) + Also add your database's JDBC driver into the classpath - you can put it in <replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/lib (or <replaceable>TOMCAT_HOME</replaceable>/lib, if you are running on Tomcat) </para> <para> MySQL example: </para> <para> - Let&#39;s configure our JCR to store data in MySQL. Let&#39;s pretend we have a user named &#34;gateinuser&#34; with a password &#34;gateinpassword&#34;. We would create a database &#34;mygateindb_portal&#34; (remember that _portal is required), and assign our user the rights to create tables. + Let's configure our JCR to store data in MySQL. Let's pretend we have a user named &#34;gateinuser&#34; with a password &#34;gateinpassword&#34;. We would create a database &#34;mygateindb_portal&#34; (remember that _portal is required), and assign our user the rights to create tables. </para> <para> - Then we need to add MySQL&#39;s JDBC driver to the classpath, and finally edit gatein.ear/02portal.war/WEB-INF/conf/jcr/jcr-configuration to contain the following: + Then we need to add MySQL's JDBC driver to the classpath, and finally edit gatein.ear/02portal.war/WEB-INF/conf/jcr/jcr-configuration to contain the following: <programlisting>gatein.jcr.datasource.driver=com.mysql.jdbc.Driver gatein.jcr.datasource.url=jdbc:mysql://localhost:3306/mygateindb${container.name.suffix} gatein.jcr.datasource.username=gateinuser Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/Configuration/EMailServiceConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -36,7 +36,7 @@ It is pre-configured for GMail, so that any GMail account can easily be used (simply use the full GMail address as username, and fill-in the password. </para> <para> - In corporate environments you will want to use your corporate SMTP gateway. When using it over SSL, like in default configuration, you may need to configure a certificate truststore, containing your SMTP server&#39;s public certificate. Depending on the key sizes, you may then also need to install Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files for your Java Runtime Environment. + In corporate environments you will want to use your corporate SMTP gateway. When using it over SSL, like in default configuration, you may need to configure a certificate truststore, containing your SMTP server's public certificate. Depending on the key sizes, you may then also need to install Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files for your Java Runtime Environment. </para> </section> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/Introduction.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/Introduction.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/Introduction.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -6,7 +6,7 @@ <chapter id="chap-Reference_Guide-Introduction"> <title>Introduction</title> <para> - JBoss Enterprise Portal Platform is based on the GateIn project which is the merge of two mature Java projects; JBoss Portal and eXo Portal. This new community project takes the best of both offerings and incorporates them into a single portal framework. The aim is to provide an intuitive user-friendly portal, and a framework to address the needs of today&#39;s Web 2.0 applications. + JBoss Enterprise Portal Platform is based on the GateIn project which is the merge of two mature Java projects; JBoss Portal and eXo Portal. This new community project takes the best of both offerings and incorporates them into a single portal framework. The aim is to provide an intuitive user-friendly portal, and a framework to address the needs of today's Web 2.0 applications. </para> <mediaobject> <imageobject role="html"> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -8,10 +8,10 @@ <section id="sect-Reference_Guide-Default_Portal_Configuration-Overview"> <title>Overview</title> <para> - JBoss Enterprise Portal Platform&#39;s default home page URL is <literal>http://{hostname}:{port}/portal/</literal>. There may be multiple independent portals deployed in parallel at any given time, each of which has its root context (<literal>http://{hostname}:{port}/sample-portal/</literal>, for example). + JBoss Enterprise Portal Platform's default home page URL is <literal>http://{hostname}:{port}/portal/</literal>. There may be multiple independent portals deployed in parallel at any given time, each of which has its root context (<literal>http://{hostname}:{port}/sample-portal/</literal>, for example). </para> <para> - Each portal container is internally composed of one or more &#39;portals&#39;. This is because there needs to be at least one such portal available. The default portal is called &#39;<emphasis>Classic</emphasis>&#39;. When accessing JBoss Enterprise Portal Platform&#39;s default URL, you are automatically directed to the &#39;<emphasis>Classic</emphasis>&#39; portal. + Each portal container is internally composed of one or more 'portals'. This is because there needs to be at least one such portal available. The default portal is called '<emphasis>Classic</emphasis>'. When accessing JBoss Enterprise Portal Platform's default URL, you are automatically directed to the '<emphasis>Classic</emphasis>' portal. </para> <para> The default portal performs another important task. When starting up JBoss Enterprise Portal Platform for the first time, its JCR database (where portal runtime-configurable settings are stored) will be empty . The default portal detects this and triggers automatic data initialization. Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalNavigationConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -33,7 +33,7 @@ <programlisting language="XML" role="XML"><xi:include href="../../extras/PortalDevelopment_DefaultPortalNavigationConfiguration/default144.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - This XML configuration defines where in the portal&#39;s <literal>WAR</literal> to look for configuration settings, and which portals, groups, and user specific views to include in portal/group/user navigation. + This XML configuration defines where in the portal's <literal>WAR</literal> to look for configuration settings, and which portals, groups, and user specific views to include in portal/group/user navigation. </para> <para> The first time the portal is launched those files will be used to create an initial navigation. That information will then be stored in the JCR content repository and can be modified and managed from the portal UI. @@ -92,7 +92,7 @@ For top nodes, the <emphasis role="bold">uri</emphasis> and the <emphasis role="bold">name</emphasis> of your navigation nodes must have the <emphasis>same</emphasis> value. For other nodes the <emphasis role="bold">uri</emphasis> is a relative path. </para> <para> - For example; <emphasis><uri>contentmanagement/fileexplorer</uri></emphasis> where &#39;<literal>contentmanagement</literal> &#39; is the name of the parent node and &#39;<literal>fileexplorer</literal>&#39; is the name of the node ( <emphasis>&#60;name&#62;fileexplorer&#60;/name&#62; </emphasis> ). + For example; <emphasis><uri>contentmanagement/fileexplorer</uri></emphasis> where '<literal>contentmanagement</literal> ' is the name of the parent node and '<literal>fileexplorer</literal>' is the name of the node ( <emphasis>&#60;name&#62;fileexplorer&#60;/name&#62; </emphasis> ). </para> </warning> </listitem> @@ -126,7 +126,7 @@ This configuration file structure is very similar to <filename>portal.xml</filename> and it can also contain container tags (some usage examples of container tags can be found in <filename>02portal.war/WEB-INF/conf/portal/portal/sharedlayout.xml</filename>). </para> <para> - Each application can decide whether to render the portlet border, the window state, the icons or portlet&#39;s mode. + Each application can decide whether to render the portlet border, the window state, the icons or portlet's mode. </para> <!-- DOC NOTE: look into including some actual examples of 'container tags' from sharedlayout.xml in place here. --> @@ -155,7 +155,7 @@ <section id="sect-Reference_Guide-Portal_Navigation_Configuration-User_Navigation"> <title>User Navigation</title> <para> - User navigation is the set of nodes and pages that are owned by a user. They are part of the user&#39;s dashboard. + User navigation is the set of nodes and pages that are owned by a user. They are part of the user's dashboard. </para> <para> Two files configure the user navigation (<filename>navigation.xml</filename> and <filename>pages.xml</filename>). They are located in the directory &#34;<filename>02portal.war/WEB-INF/conf/portal/users/{userName}</filename>&#34;. Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalPermissionConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -66,7 +66,7 @@ <term>mandatory.groups</term> <listitem> <para> - Groups that can&#39;t be deleted. + Groups that can't be deleted. </para> </listitem> </varlistentry> @@ -74,7 +74,7 @@ <term>mandatory.mstypes</term> <listitem> <para> - Membership types that can&#39;t be deleted. + Membership types that can't be deleted. </para> </listitem> </varlistentry> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -47,7 +47,7 @@ It is also possible to use a proprietary XML format to define translations. This is a more convenient way to translate a document for some languages such as Japanese, Arabic or Russian. </para> <para> - Property files have to be ISO 8859-1 encoded, while the XML file can define its encoding. As a result it&#39;s easier for a human being to read a translation in XML instead of having to decode and encode the property file. + Property files have to be ISO 8859-1 encoded, while the XML file can define its encoding. As a result it's easier for a human being to read a translation in XML instead of having to decode and encode the property file. </para> <para> For more information refer to: <xref linkend="chap-Reference_Guide-XML_Resources_Bundles" /> @@ -189,7 +189,7 @@ </step> <step> <para> - In <filename>portlet.xml</filename>, add <parameter>Spanish</parameter> as a <emphasis role="bold">supported-locale</emphasis> (&#39;<emphasis role="bold">es</emphasis>&#39; is the two letter code for Spanish). The <emphasis role="bold">resource-bundle</emphasis> is already declared and is the same for all languages : + In <filename>portlet.xml</filename>, add <parameter>Spanish</parameter> as a <emphasis role="bold">supported-locale</emphasis> ('<emphasis role="bold">es</emphasis>' is the two letter code for Spanish). The <emphasis role="bold">resource-bundle</emphasis> is already declared and is the same for all languages : </para> <programlisting language="XML" role="XML">&#60;supported-locale&#62;en&#60;/supported-locale&#62; Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/RTLFramework.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -55,7 +55,7 @@ <term>dir</term> <listitem> <para> - The string &#39;<emphasis role="bold">ltr</emphasis>&#39; if the orientation is LT or the string &#39;<emphasis role="bold">rtl</emphasis>&#39; if the orientation is RT. + The string '<emphasis role="bold">ltr</emphasis>' if the orientation is LT or the string '<emphasis role="bold">rtl</emphasis>' if the orientation is RT. </para> </listitem> </varlistentry> @@ -133,7 +133,7 @@ </para> <note> <para> - It is important to consider whether the image to be mirrored is symmetrical as this will impact it&#39;s final appearance. + It is important to consider whether the image to be mirrored is symmetrical as this will impact it's final appearance. </para> </note> <para> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -65,7 +65,7 @@ <note> <title>CSS Classes</title> <para> - The window decorators and the default portlet specification CSS classes should be considered separate types of skinning components, but they need to be included as part of the overall portal skin. The portal skin must include these components&#39; CSS classes or they will not be displayed correctly. + The window decorators and the default portlet specification CSS classes should be considered separate types of skinning components, but they need to be included as part of the overall portal skin. The portal skin must include these components' CSS classes or they will not be displayed correctly. </para> <para> A portlet skin does not need to be included as part of the portal skin and can be included within the portlets web application. @@ -108,7 +108,7 @@ <section id="sect-Reference_Guide-Skinning_the_Portal-Skins_in_Page_Markups"> <title>Skins in Page Markups</title> <para> - A JBoss Enterprise Portal Platform skin contains CSS styles for the portal&#39;s components but also shares components that may be reused in portlets. When JBoss Enterprise Portal Platform generates a portal page markup, it inserts stylesheet links in the page&#39;s <literal>head</literal> tag. + A JBoss Enterprise Portal Platform skin contains CSS styles for the portal's components but also shares components that may be reused in portlets. When JBoss Enterprise Portal Platform generates a portal page markup, it inserts stylesheet links in the page's <literal>head</literal> tag. </para> <para> There are two main types of CSS links that will appear in the <literal>head</literal> tag: a link to the portal skin CSS file and a link to the portlet skin CSS files. @@ -169,7 +169,7 @@ <section id="sect-Reference_Guide-The_Skin_Service-Resource_Request_Filter"> <title>Resource Request Filter</title> <para> - Because of JBoss Enterprise Portal Platform&#39;s Right-To-Left support, all CSS files need to be retrieved through a Servlet filter and the web application needs to be configured to activate this filter. This is already done for <literal>01eXoResources.war</literal> web application which contains the default skin. + Because of JBoss Enterprise Portal Platform's Right-To-Left support, all CSS files need to be retrieved through a Servlet filter and the web application needs to be configured to activate this filter. This is already done for <literal>01eXoResources.war</literal> web application which contains the default skin. </para> <para> Any new web applications containing skinning CSS files will need to have the following added to their <filename>web.xml</filename> : @@ -197,7 +197,7 @@ <term>gatein-resources.xml</term> <listitem> <para> - For the default portal skin, this file contains definitions for the portal skin, the window decorations that this skin provides and well as defining some javascript resources which are not related to the skin. The default portal skin doesn&#39;t directly define portlet skins, these should be provided by the portlets themselves. + For the default portal skin, this file contains definitions for the portal skin, the window decorations that this skin provides and well as defining some javascript resources which are not related to the skin. The default portal skin doesn't directly define portlet skins, these should be provided by the portlets themselves. </para> </listitem> </varlistentry> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -33,7 +33,7 @@ <section id="sect-Reference_Guide-XML_Resources_Bundles-XML_format"> <title>XML format</title> <para> - The XML format is very simple and has been developed based on the &#39;Don&#39;t Repeat Yourself&#39; (DRY) principle. Usually resource bundle keys are hierarchically defined and we can leverage the hierarchic nature of the XML for that purpose. Here is an example of turning a property file into an XML resource bundle file: + The XML format is very simple and has been developed based on the 'Don't Repeat Yourself' (DRY) principle. Usually resource bundle keys are hierarchically defined and we can leverage the hierarchic nature of the XML for that purpose. Here is an example of turning a property file into an XML resource bundle file: </para> <programlisting language="Java" role="Java"><xi:include href="../../extras/PortalDevelopment_XMLResourceBundles/default195.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -6,7 +6,7 @@ <section id="sect-Reference_Guide-Bridge_Configuration"> <title>Bridge Configuration</title> <para> - The 329 specification is aimed at making the developer&#39;s life as easy as possible with JSF+Portlet development. You will see below that there are minimal settings to getting any JSF web application up and running in the Portal environment. + The 329 specification is aimed at making the developer's life as easy as possible with JSF+Portlet development. You will see below that there are minimal settings to getting any JSF web application up and running in the Portal environment. </para> <!-- Commented as Maven Archetypes section removed from gettingstarted.xml <para> @@ -24,10 +24,10 @@ <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Configuration/default197.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - When <parameter>preserveActionParams</parameter> is set to <parameter>TRUE</parameter>, the bridge must maintain any request parameters assigned during the portlet&#39;s action request. + When <parameter>preserveActionParams</parameter> is set to <parameter>TRUE</parameter>, the bridge must maintain any request parameters assigned during the portlet's action request. </para> <para> - The request parameters are maintained in the <emphasis>&#34;bridge request scope&#34;</emphasis>. When this attribute is not present or is <parameter>FALSE</parameter> the action&#39;s request parameters are only maintained for the duration of the <emphasis>portlet request scope</emphasis>. + The request parameters are maintained in the <emphasis>&#34;bridge request scope&#34;</emphasis>. When this attribute is not present or is <parameter>FALSE</parameter> the action's request parameters are only maintained for the duration of the <emphasis>portlet request scope</emphasis>. </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Configuration/default198.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -9,7 +9,7 @@ JBoss Portlet Bridge not only gives you the ability to run JSF web applications in a portlet, but also gives you the benefit of running supported JBoss frameworks like <application>Seam</application> and <application>RichFaces</application>. </para> <section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Whats_New_in_2.0"> - <title>What&#39;s New in 2.0?</title> + <title>What's New in 2.0?</title> <section id="sect-Reference_Guide-Whats_New_in_2.0-Eventing"> <title>Eventing</title> <para> @@ -50,13 +50,13 @@ The bridge automates the processing of public render parameters. </para> <para> - A public render parameter can be mapped to an object&#39;s accessor (<literal>get</literal>/<literal>set</literal> method) designed to handle a String representation of the value via a <application>Faces</application> <literal>ValueExpression</literal>. + A public render parameter can be mapped to an object's accessor (<literal>get</literal>/<literal>set</literal> method) designed to handle a String representation of the value via a <application>Faces</application> <literal>ValueExpression</literal>. </para> <para> - When a new public render parameter value is received in a request, the bridge sets the value by calling the <literal>ValueExpression</literal>&#39;s <parameter>setValue()</parameter>. + When a new public render parameter value is received in a request, the bridge sets the value by calling the <literal>ValueExpression</literal>'s <parameter>setValue()</parameter>. </para> <para> - At the end of a request, if the current value of any mapped public render parameter doesn&#39;t match the current incoming value, the bridge sets the new value in an outgoing public render parameter (if feasible in the given phase). + At the end of a request, if the current value of any mapped public render parameter doesn't match the current incoming value, the bridge sets the new value in an outgoing public render parameter (if feasible in the given phase). </para> <para> See <xref linkend="sect-Reference_Guide-Portlet_2.0_Coordination-Public_Render_Parameters" /> for details and examples. @@ -83,7 +83,7 @@ For example, the <literal>PortalIdentity</literal> <application>Seam</application> component allows you to instantly have Single Sign-On (SSO) between <application>Seam</application> and <application>GateIn</application> or <application>JBoss Enterprise Portal Platform</application>. </para> <para> - This extension is configured in your <application>Seam</application> application&#39;s <filename>components.xml</filename> file as follows. + This extension is configured in your <application>Seam</application> application's <filename>components.xml</filename> file as follows. </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_GettingStarted/default218.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/portlet_development.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -14,7 +14,7 @@ When your application uses request attributes on a per request basis and you do not want that particular attribute to be managed in the extended bridge request scope, you must use the following configuration in your <filename>faces-config.xml</filename>. </para> <para> - In the code sample below you can see that any attribute namespaced as <literal>foo.bar</literal> or any attribute beginning with <literal>foo.baz(wild-card)</literal> will be excluded from the bridge request scope and only be used per that application&#39;s request. + In the code sample below you can see that any attribute namespaced as <literal>foo.bar</literal> or any attribute beginning with <literal>foo.baz(wild-card)</literal> will be excluded from the bridge request scope and only be used per that application's request. </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/PortletBridge_Portlet_Development/default223.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -27,7 +27,7 @@ A <literal>PortletMode</literal> represents a distinct render path within an application. There are three standard modes: <emphasis>view</emphasis>, <emphasis>edit</emphasis>, and <emphasis>help</emphasis>. </para> <para> - The bridge&#39;s <literal>ExternalContext.encodeActionURL</literal> recognizes the query string parameter <literal>javax.portlet.faces.PortletMode</literal> and uses this parameter&#39;s value to set the portlet mode on the underlying portlet <literal>actionURL</literal> or response. + The bridge's <literal>ExternalContext.encodeActionURL</literal> recognizes the query string parameter <literal>javax.portlet.faces.PortletMode</literal> and uses this parameter's value to set the portlet mode on the underlying portlet <literal>actionURL</literal> or response. </para> <para> Once processed it then removes this parameter from the query string. This means the following navigation rule causes one to render the \edit.jspx viewId in the portlet edit mode: @@ -38,9 +38,9 @@ <section id="sect-Reference_Guide-Developing_Portlets_with_the_Bridge-Navigating_to_a_modes_last_viewId"> - <title>Navigating to a mode&#39;s last viewId</title> + <title>Navigating to a mode's last viewId</title> <para> - By default a mode change will start in the mode&#39;s default view without any (prior) existing state. One common portlet pattern when returning to a mode left after entering another mode (e.g.. view -&#62; edit -&#62; view) is to return to the last view (and state) of this origin mode. + By default a mode change will start in the mode's default view without any (prior) existing state. One common portlet pattern when returning to a mode left after entering another mode (e.g.. view -&#62; edit -&#62; view) is to return to the last view (and state) of this origin mode. </para> <para> The bridge will explicitly encode the necessary information so that when returning to a prior mode it can target the appropriate view and restore the appropriate state. @@ -69,7 +69,7 @@ <programlisting language="XML" role="XML">/viewId?javax.portlet.faces.PortletMode=view&amp;.... </programlisting> <para> - Without wild-carding, when a subsequent navigation occurs from this new view, the navigation rules wouldn&#39;t resolve because there wouldn&#39;t be an exact match. Likewise, the above <literal>edit.jspx</literal> + Without wild-carding, when a subsequent navigation occurs from this new view, the navigation rules wouldn't resolve because there wouldn't be an exact match. Likewise, the above <literal>edit.jspx</literal> </para> <programlisting language="XML" role="XML">&#60;from-view-id&#62; @@ -194,7 +194,7 @@ Then, in your JSP or Facelets page, you can use: </para> -<programlisting language="XML" role="XML">#{httpSessionScope[&#39;your parameter name&#39;]} +<programlisting language="XML" role="XML">#{httpSessionScope['your parameter name']} </programlisting> <para> <note> Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml =================================================================== --- epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -326,7 +326,7 @@ </callout> <callout arearefs="area-Reference_Guide-Deploying_your_first_Portlet-Application_Descriptors.portletinfo"> <para> - When rendered, the portlet&#39;s title is displayed as the header in the portlet window, unless it is overridden programmatically. In the example above the title would be <literal>Simplest Hello World Portlet</literal> . + When rendered, the portlet's title is displayed as the header in the portlet window, unless it is overridden programmatically. In the example above the title would be <literal>Simplest Hello World Portlet</literal> . </para> </callout> </calloutlist> @@ -472,7 +472,7 @@ As well as the <literal>VIEW</literal> portlet mode, the specification defines two other modes; <literal>EDIT</literal> and <literal>HELP</literal>. </para> <para> - These modes need to be defined in the <filename>portlet.xml</filename> descriptor. This will enable the corresponding buttons on the portlet&#39;s window. + These modes need to be defined in the <filename>portlet.xml</filename> descriptor. This will enable the corresponding buttons on the portlet's window. </para> <para> The generic portlet that is inherited dispatches the different views to the methods: <literal>doView</literal> , <literal>doHelp</literal> and <literal>doEdit</literal>. @@ -595,7 +595,7 @@ <section id="sect-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge_"> <title>JSF example using the JBoss Portlet Bridge </title> <para> - In order to write a portlet using JSF a &#39;bridge&#39; is needed. This software allows developers to write a portlet application as if it was a JSF application. The bridge then negotiates the interactions between the two layers. + In order to write a portlet using JSF a 'bridge' is needed. This software allows developers to write a portlet application as if it was a JSF application. The bridge then negotiates the interactions between the two layers. </para> <para> An example using the JBoss Portlet Bridge is available in the <filename>/jboss-epp-&lt;VERSION&gt;-src/portal/examples/portlets/</filename> directory of the JBoss Enterprise Portal Platform sources package or the <filename>/jboss-epp-&lt;VERSION&gt;-docs/epp-doc/examples/portlets</filename> directory of the documentation package. The configuration is slightly different from a JSP application. This example can be used as a base to configure instead of creating a new application. @@ -630,17 +630,17 @@ </callout> <callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.view"> <para> - This is a mandatory parameter to define what&#39;s the default page to display. + This is a mandatory parameter to define what's the default page to display. </para> </callout> <callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.edit"> <para> - This parameter defines which page to display on the &#39;edit&#39; mode. + This parameter defines which page to display on the 'edit' mode. </para> </callout> <callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-JSF_example_using_the_JBoss_Portlet_Bridge.help"> <para> - This parameter defines which page to display on the &#39;help&#39; mode. + This parameter defines which page to display on the 'help' mode. </para> </callout> </calloutlist> Modified: epp/docs/branches/5.2/Release_Notes/en-US/Common_Content/Conventions.xml =================================================================== --- epp/docs/branches/5.2/Release_Notes/en-US/Common_Content/Conventions.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/Release_Notes/en-US/Common_Content/Conventions.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -163,7 +163,7 @@ <important> <title>Important</title> <para> - Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' won't cause data loss but may cause irritation and frustration. + Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' will not cause data loss but may cause irritation and frustration. </para> </important> Modified: epp/docs/branches/5.2/User_Guide/en-US/Common_Content/Conventions.xml =================================================================== --- epp/docs/branches/5.2/User_Guide/en-US/Common_Content/Conventions.xml 2011-04-20 05:53:54 UTC (rev 6295) +++ epp/docs/branches/5.2/User_Guide/en-US/Common_Content/Conventions.xml 2011-04-20 06:35:00 UTC (rev 6296) @@ -152,7 +152,7 @@ <important> <title>Important</title> <para> - Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' won't cause data loss but may cause irritation and frustration. + Important boxes detail things that are easily missed: configuration changes that only apply to the current session, or services that need restarting before an update will apply. Ignoring a box labeled 'Important' will not cause data loss but may cause irritation and frustration. </para> </important> <warning>