Author: thomas.heute(a)jboss.com Date: 2009-12-21 09:33:23 -0500 (Mon, 21 Dec 2009) New Revision: 1102 Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml Log: - GateIn is a merge of projects (not the product) - Would not build with twice the same id used Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/Introduction.xml 2009-12-21 13:59:10 UTC (rev 1101) +++ portal/trunk/docs/user-guide/en/modules/Introduction.xml 2009-12-21 14:33:23 UTC (rev 1102) @@ -2,28 +2,9 @@ <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]> <chapter id="chap-User_Guide-Introduction"> - <!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - - --><title>Introduction</title> + <title>Introduction</title> <para> - Enterprise Portal Platform (<acronym>EPP</acronym>) 5.0 is a merge of two mature projects; the JBoss Portal and the eXo Portal. It takes the best of both offerings and incorporates them into a single new project. The aim is to provide an intuitive portal for as-is use and a framework to build upon depending on your needs. + GateIn is a merge of two mature projects; the JBoss Portal and the eXo Portal. It takes the best of both offerings and incorporates them into a single new project. The aim is to provide an intuitive portal for as-is use and a framework to build upon depending on your needs. </para> <mediaobject> <imageobject> Modified: portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2009-12-21 13:59:10 UTC (rev 1101) +++ portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2009-12-21 14:33:23 UTC (rev 1102) @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='utf-8' ?> <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]> -<section id="sect-User_Guide-Toolbar"> +<section id="sect-User_Guide-Toolbar-Concept"> <!-- Copyright (C) 2009 eXo Platform SAS.