Author: mmcallis
Date: 2008-07-02 00:34:13 -0400 (Wed, 02 Jul 2008)
New Revision: 11250
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/target.xml
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml
Log:
adding some trademark changes from 2.6 branch
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
===================================================================
---
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-02
02:14:42 UTC (rev 11249)
+++
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-02
04:34:13 UTC (rev 11250)
@@ -107,8 +107,8 @@
</para>
</listitem>
<listitem>
- <para>
- <emphasis role="bold">Deploy a RDBMS JDBC
connector:</emphasis> a RDBMS JDBC connector is required for JBoss Portal to
communicate with a database. Copy the connector into the
<filename>$JBOSS_HOME/server/default/lib/</filename> directory. For example, a
RDBMS JDBC connector for MySQL can be download from <ulink
url="http://www.mysql.com/products/connector/j/"></ulink>. For the
correct RDMBS JDBC connector, please refer to the database documentation.
+ <para>
+ <emphasis role="bold">Deploy an RDBMS <trademark
class="trade">JDBC</trademark> connector:</emphasis> an RDBMS
JDBC connector is required for JBoss Portal to communicate with a database. Copy the
connector into the <filename>$JBOSS_HOME/server/default/lib/</filename>
directory. For example, an RDBMS JDBC connector for MySQL can be download from <ulink
url="http://www.mysql.com/products/connector/j/"></ulink>. For the
correct RDMBS JDBC connector, please refer to the database documentation.
</para>
</listitem>
</orderedlist>
@@ -265,7 +265,7 @@
<title>Operating System Environment Settings</title>
<para>For build targets to work, you must configure a
<filename>JBOSS_HOME</filename> environment variable. This environment
variable must point to the root directory of the JBoss EAP or JBoss AS installation
directory, which is the directory where the JBoss EAP or JBoss AS files were extracted
to.
</para>
- <para>On <trademark
class="registered">Windows</trademark>, this is accomplished by going
to
+ <para>On Windows, this is accomplished by going to
<emphasis>Start > Settings > Control Panel > System >
Advanced > Environment Variables</emphasis>. Under the
<emphasis>System Variables</emphasis>
section, click
@@ -278,7 +278,7 @@
</mediaobject>
</para>
<para>
- To configure the <filename>JBOSS_HOME</filename> environment variable
on <trademark class="registered">Linux</trademark>:
+ To configure the <filename>JBOSS_HOME</filename> environment variable
on Linux:
</para>
<para>
<orderedlist>
@@ -327,7 +327,7 @@
<para>
Replace <replaceable>proxy-hostname</replaceable> with the proxy
server's hostname, and <replaceable>proxy-port</replaceable> with the
correct proxy server port number.
</para>
- <para>To build and deploy JBoss Portal from the sources, change into the
<filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where
<filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the
JBoss Portal source code was downloaded to. Then, <trademark
class="registered">Windows</trademark>, users need to run the
<command>build.bat deploy</command> command, and <trademark
class="registered">Linux</trademark> users need to run the
<command>sh build.sh deploy</command> command.
+ <para>To build and deploy JBoss Portal from the sources, change into the
<filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where
<filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the
JBoss Portal source code was downloaded to. Then, Windows, users need to run the
<command>build.bat deploy</command> command, and Linux users need to run the
<command>sh build.sh deploy</command> command.
</para>
<para>
At the end of the build process, the <filename>jboss-portal.sar</filename>
file is copied into the
<filename>$JBOSS_HOME/server/default/deploy/</filename> directory:
@@ -343,7 +343,7 @@
<note>
<title>Portal Modules</title>
<para>
- The previous steps install a bare version of JBoss Portal. In previous versions,
several additional modules were deployed as well, but this has since been modularized to
provide greater flexibility. To deploy additional modules, refer to the <ulink
url="http://wiki.jboss.org/wiki/Wiki.jsp?page=PortalModules">...
module list</ulink> for more information. To deploy all modules at once, change into
the <filename>build</filename> directory. If you are running <trademark
class="registered">Linux</trademark>, run the <command>sh
build.sh deploy-all</command> command. On <trademark
class="registered">Windows</trademark>, run the
<command>build.bat deploy-all</command> command.
+ The previous steps install a bare version of JBoss Portal. In previous versions,
several additional modules were deployed as well, but this has since been modularized to
provide greater flexibility. To deploy additional modules, refer to the <ulink
url="http://wiki.jboss.org/wiki/Wiki.jsp?page=PortalModules">...
module list</ulink> for more information. To deploy all modules at once, change into
the <filename>build</filename> directory. If you are running Linux, run the
<command>sh build.sh deploy-all</command> command. On Windows, run the
<command>build.bat deploy-all</command> command.
</para>
</note>
</para>
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/target.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/target.xml 2008-07-02
02:14:42 UTC (rev 11249)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/target.xml 2008-07-02
04:34:13 UTC (rev 11250)
@@ -1,7 +1,7 @@
<preface id="target" revision="1">
<title>Target Audience</title>
<para>
- This guide is aimed towards Portlet developers, Portal administrators, and those
wishing to
+ This guide is aimed towards portlet developers, portal administrators, and those
wishing to
implement and extend the JBoss Portal framework. For end-user documentation, please
refer to the JBoss Portal User Manual from the <ulink
url="http://labs.jboss.com/portal/jbossportal/docs/index.html"&... Portal
Documentation Library</ulink>
.</para>
</preface>
\ No newline at end of file
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml
===================================================================
---
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml 2008-07-02
02:14:42 UTC (rev 11249)
+++
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/tutorials.xml 2008-07-02
04:34:13 UTC (rev 11250)
@@ -16,7 +16,7 @@
<title>Portlet Primer</title>
<sect1 id="portlet_primer">
<title>JSR-168 Overview</title>
- <para>The JSR-168 Portlet Specification aims at defining portlets that can be
used by any JSR-168 portlet container, also known as a portal. There are different portals
with commercial and non-commercial licenses. This chapter gives a brief overview of the
<ulink
url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet
Specification</ulink>. Portlet developers are strongly encouraged to read the
<ulink
url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet
Specification</ulink>.
+ <para>The <ulink
url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet
Specification</ulink> aims at defining portlets that can be used by any JSR-168
portlet container, also known as a portal. There are different portals with commercial and
non-commercial licenses. This chapter gives a brief overview of the JSR-168 Portlet
Specification. Portlet developers are strongly encouraged to read the <ulink
url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet
Specification</ulink>.
</para>
<para>
JBoss Portal is fully JSR-168 compliant, which means any JSR-168 portlet behaves
as it should inside the portal.