11:22 p.m.
Author: mmcallis
Date: 2008-06-11 00:22:00 -0400 (Wed, 11 Jun 2008)
New Revision: 10977
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
Log:
startin to fix "Java" and "MySQL" trademark
attributions
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
===================================================================
---
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-06-10
23:15:35 UTC (rev 10976)
+++
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-06-11
04:22:00 UTC (rev 10977)
@@ -89,7 +89,7 @@
<sect3>
<title>Database Setup</title>
<para>
- A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an
embedded Hypersonic SQL database that JBoss Portal can use; however, this is only
recommended for developer use. The following databases are recommended for production use,
and have had test suites run against them: MySQL 4, MySQL 5, <trademark
class="registered">Microsoft</trademark> <trademark
class="registered">SQL Server</trademark>, PostgreSQL 8, <trademark
class="registered">Oracle</trademark> Database 9, and <trademark
class="registered">Oracle</trademark> Database 10. JBoss Portal can use
any database that is supported by Hibernate.
+ A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an
embedded Hypersonic SQL database that JBoss Portal can use; however, this is only
recommended for developer use. The following databases are recommended for production use,
and have had test suites run against them: <trademark
class="registered">MySQL</trademark> 4, MySQL 5, <trademark
class="registered">Microsoft</trademark> <trademark
class="registered">SQL Server</trademark>, PostgreSQL 8, <trademark
class="registered">Oracle</trademark> Database 9, and <trademark
class="registered">Oracle</trademark> Database 10. JBoss Portal can use
any database that is supported by Hibernate.
</para>
<para>
To configure a database to use with JBoss Portal:
@@ -117,7 +117,7 @@
<sect3>
<title>Datasource Descriptors</title>
<para>
- The JBoss Portal binary download that was extracted in <xref
linkend="install_binarydownload"/>, contains pre-configured Datasource
descriptors for the more popular databases. Datasource descriptors are provided for the
MySQL 4, MySQL 5, PostgreSQL, <trademark
class="registered">Microsoft</trademark> <trademark
class="registered">SQL Server</trademark>, and <trademark
class="registered">Oracle</trademark> databases, and can be found in
the <filename>setup</filename> subdirectory where the JBoss Portal binary was
extracted to:
+ The JBoss Portal binary download that was extracted in <xref
linkend="install_binarydownload"/>, contains pre-configured Datasource
descriptors for the more popular databases. Datasource descriptors are provided for the
<trademark class="registered">MySQL</trademark> 4, MySQL 5,
PostgreSQL, <trademark class="registered">Microsoft</trademark>
<trademark class="registered">SQL Server</trademark>, and
<trademark class="registered">Oracle</trademark> databases, and can
be found in the <filename>setup</filename> subdirectory where the JBoss Portal
binary was extracted to:
</para>
<mediaobject>
<imageobject>
@@ -412,7 +412,7 @@
<sect2>
<title>Datasource Configuration</title>
<para>
- The JBoss Portal binary download that was extracted in <xref
linkend="install_binarydownload"/>, contains pre-configured Datasource
descriptors for the more popular databases. Datasource descriptors are provided for the
MySQL 4, MySQL 5, PostgreSQL, <trademark
class="registered">Microsoft</trademark> <trademark
class="registered">SQL Server</trademark>, and <trademark
class="registered">Oracle</trademark> databases, and can be found in
the <filename>setup</filename> subdirectory where the JBoss Portal binary was
extracted to:
+ The JBoss Portal binary download that was extracted in <xref
linkend="install_binarydownload"/>, contains pre-configured Datasource
descriptors for the more popular databases. Datasource descriptors are provided for the
<trademark class="registered">MySQL</trademark> 4, MySQL 5,
PostgreSQL, <trademark class="registered">Microsoft</trademark>
<trademark class="registered">SQL Server</trademark>, and
<trademark class="registered">Oracle</trademark> databases, and can
be found in the <filename>setup</filename> subdirectory where the JBoss Portal
binary was extracted to:
</para>
<mediaobject>
<imageobject>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml
===================================================================
---
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml 2008-06-10
23:15:35 UTC (rev 10976)
+++
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml 2008-06-11
04:22:00 UTC (rev 10977)
@@ -22,7 +22,7 @@
<sect1 id="manual_migration">
<title>Manual Upgrade</title>
<para>
- The database schema has not changed since JBoss Portal 2.4; however, there are
several differences when using a database created by JBoss Portal 2.4, that prevent simply
deploying the latest version of JBoss Portal. For example, some portlets are no longer
present in JBoss Portal 2.6, and certain existing portlets are now packaged differently.
This chapter describes updating a MySQL database created by JBoss Portal 2.4, for use with
JBoss Portal 2.6.
+ The database schema has not changed since JBoss Portal 2.4; however, there are
several differences when using a database created by JBoss Portal 2.4, that prevent simply
deploying the latest version of JBoss Portal. For example, some portlets are no longer
present in JBoss Portal 2.6, and certain existing portlets are now packaged differently.
This chapter describes updating a <trademark
class="registered">MySQL</trademark> database created by JBoss Portal
2.4, for use with JBoss Portal 2.6.
</para>
<para>
Users, roles, and pages created in JBoss Portal 2.4 should be accessible in JBoss
Portal 2.6 deployments.
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
===================================================================
---
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-06-10
23:15:35 UTC (rev 10976)
+++
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-06-11
04:22:00 UTC (rev 10977)
@@ -31,8 +31,8 @@
</sect1>
<sect1>
<title>Supported Operating Systems</title>
- <para>JBoss Portal is 100% pure Java, and therefore it is interoperable with
most operating systems
- capable of running a Java Virtual Machine (JVM), including <trademark
class="registered">Linux</trademark>, <trademark
class="registered">Windows</trademark>, <trademark
class="registered">UNIX</trademark> operating systems, and Mac OS X.
+ <para>JBoss Portal is 100% pure <trademark
class="trade">Java</trademark>, and therefore it is interoperable with
most operating systems
+ capable of running a Java Virtual Machine (<trademark
class="trade">JVM</trademark>), including <trademark
class="registered">Linux</trademark>, <trademark
class="registered">Windows</trademark>, <trademark
class="registered">UNIX</trademark> operating systems, and Mac OS X.
</para>
</sect1>
<sect1>
@@ -47,12 +47,12 @@
<title>Databases</title>
<para>JBoss Portal is database-agnostic. The following list outlines
known-to-be-working database vendor and version combinations:</para>
<itemizedlist>
- <listitem>MySQL
4.<replaceable>x</replaceable>.<replaceable>x</replaceable> (use
<ulink
url="http://dev.mysql.com/downloads/connector/j/3.1.html">Co...
3.1</ulink>)</listitem>
+ <listitem><trademark
class="registered">MySQL</trademark>
4.<replaceable>x</replaceable>.<replaceable>x</replaceable> (use
<ulink
url="http://dev.mysql.com/downloads/connector/j/3.1.html">Co...
3.1</ulink>)</listitem>
<listitem>MySQL 5 (<ulink
url="http://wiki.jboss.org/wiki/Wiki.jsp?page=AvoidMySQL5DataTruncat...
issue</ulink>)
</listitem>
<listitem>PostgreSQL
8.<replaceable>x</replaceable></listitem>
<listitem>Hypersonic SQL</listitem>
- <listitem>Derby</listitem>
+ <listitem>Apache Derby</listitem>
<listitem><trademark class="registered">Oracle</trademark>
Database 9 and 10g (use the <ulink
url="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/i...
driver from the Oracle 10 branch</ulink> even if you are running Oracle
9)</listitem>
<listitem><trademark
class="registered">Microsoft</trademark><trademark
class="registered"> SQL Server</trademark></listitem>
<listitem>MaxDB</listitem>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
===================================================================
---
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-10
23:15:35 UTC (rev 10976)
+++
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-11
04:22:00 UTC (rev 10977)
@@ -1,7 +1,7 @@
<preface id="trademarks">
<title>Please Read: Important Trademark Information</title>
<para>
- JavaServer, JSP, Java, Java runtime environment, JRE, J2EE, JVM, Javadoc, JavaScript,
and J2SE are trademarks or registered trademarks of Sun Microsystems, Inc. in the United
States and other countries.
+ JavaServer, JSP, Java, JMX, JDK, Java runtime environment, JRE, J2EE, JVM, Javadoc,
JavaScript, and J2SE are trademarks or registered trademarks of Sun Microsystems, Inc. in
the United States and other countries.
</para>
<para>
JBoss is a registered trademark of Red Hat, Inc. in the U.S. and other countries.