Author: mmcallis Date: 2008-06-20 02:00:27 -0400 (Fri, 20 Jun 2008) New Revision: 11096 Modified: docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/acknowledgements.xml docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/featurelist.xml docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/overview.xml Log: - minor edits - trademark updates Modified: docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/acknowledgements.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/acknowledgements.xml 2008-06-20 04:52:29 UTC (rev 11095) +++ docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/acknowledgements.xml 2008-06-20 06:00:27 UTC (rev 11096) @@ -26,7 +26,7 @@ for existing struts applications to work with the Portal. </listitem> <listitem> - A few Red Hat employees, Remy Maucherat for Tomcat configuration, Magesh Kumar Bojan and Martin Putz always there to help our customers, + A few Red Hat employees, Remy Maucherat for Apache Tomcat configuration, Magesh Kumar Bojan and Martin Putz always there to help our customers, Prabhat Jha for making sure that JBoss Portal runs great everywhere. Noel Rocher for his early feedback on JBoss Portal 2.6 and contributions. James Cobb for the Renaissance theme. </listitem> Modified: docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/featurelist.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/featurelist.xml 2008-06-20 04:52:29 UTC (rev 11095) +++ docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/featurelist.xml 2008-06-20 06:00:27 UTC (rev 11096) @@ -47,7 +47,7 @@ <emphasis role="bold">Single Sign On</emphasis> <itemizedlist> <listitem> - <emphasis role="bold">Leverages Tomcat and JBoss single sign on (SSO) solutions.</emphasis> + <emphasis role="bold">Leverages Apache Tomcat and JBoss single sign on (SSO) solutions.</emphasis> </listitem> <listitem> <emphasis role="bold">Integrates with JOSSO and CAS out of the box. (Experimental support for Open SSO)</emphasis> @@ -61,7 +61,7 @@ <emphasis role="bold">Connect to virtually any LDAP server</emphasis> </listitem> <listitem> - <emphasis role="bold">Integrates with Sun Active Directory and OpenLDAP out of the box. (Experimental support for Active Directory)</emphasis> + <emphasis role="bold">Integrates with <trademark class="trade">Sun</trademark> Active Directory and OpenLDAP out of the box. (Experimental support for Active Directory)</emphasis> </listitem> </itemizedlist> </para> @@ -127,7 +127,7 @@ <listitem> <emphasis role="bold">Existing Framework support:</emphasis> Portlets utilizing Struts, - Spring MVC, Sun JSF-RI, AJAX, or MyFaces are supported. + Spring MVC, Sun JSF-RI, AJAX, and Apache MyFaces are supported. </listitem> </itemizedlist> <para> Modified: docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/overview.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/overview.xml 2008-06-20 04:52:29 UTC (rev 11095) +++ docs/branches/JBoss_Portal_Branch_2_6/common/en/modules/overview.xml 2008-06-20 06:00:27 UTC (rev 11096) @@ -1,4 +1,4 @@ -<preface id="overview"> +<preface id="overview"> <title>JBoss Portal - Overview</title> <para> <imageobject> @@ -11,28 +11,28 @@ goal by deploying enterprise portals within their IT infrastructure. Enterprise portals simplify access to information by providing a single source of interaction with corporate information. Although today's packaged portal frameworks help enterprises launch portals more - quickly, only JBoss Portal can deliver the benefits of a zero-cost open source license + quickly, only JBoss Portal can deliver the benefits of a zero-cost open source license, combined with a flexible and scalable underlying platform.</para> <para>JBoss Portal provides an open source and standards-based environment for hosting and serving a portal's Web interface, publishing and managing its content, and customizing its - experience. It is entirely standards-based and supports the JSR-168 portlet specification, + experience. It is entirely standards-based, and supports the JSR-168 portlet specification, which allows you to easily plug-in standards-compliant portlets to meet your specific portal needs. JBoss Portal is available through the business-friendly <ulink url="http://jboss.com/opensource/lgpl/faq">LGPL</ulink> - open source license and is + open source license, and is supported by <ulink url="http://www.jboss.com/services/index">Red Hat Middleware, LLC Professional Support and Consulting </ulink> . JBoss support services are available to assist you in designing, developing, deploying, and ultimately managing your portal environment. JBoss Portal is - currently developed by Red Hat Middleware, LLC developers and community contributors. + currently developed by Red Hat Middleware, LLC developers, and community contributors. </para> - <para>The JBoss Portal framework and architecture includes the portal container and supports a - wide range of features including standard portlets, single sign-on, clustering and + <para>The JBoss Portal framework and architecture include the portal container, and support a + wide range of features, including standard portlets, single sign-on, clustering, and internationalization. Portal themes and layouts are configurable. Fine-grained security - administration down to portlet permissions rounds out the security model.</para> + administration -- down to portlet permissions -- rounds out the security model.</para> <para> <emphasis role="bold">JBoss Portal Resources:</emphasis> <orderedlist>