db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r930280 - in /db/derby/docs/trunk/src: adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Fri, 02 Apr 2010 14:26:37 GMT
Author: chaase3
Date: Fri Apr  2 14:26:36 2010
New Revision: 930280

URL: http://svn.apache.org/viewvc?rev=930280&view=rev
Log:
DERBY-4592: Documentation: Update Sun trademarks in manuals

Updated trademarks topics and others where trademarks appeared.

Patch: DERBY-4592-3.diff

Modified:
    db/derby/docs/trunk/src/adminguide/cadminapps811695.dita
    db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
    db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita
    db/derby/docs/trunk/src/adminguide/cadminssl.dita
    db/derby/docs/trunk/src/adminguide/radmintrademderby.dita
    db/derby/docs/trunk/src/devguide/cdevcsecure67151.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita
    db/derby/docs/trunk/src/devguide/cdevsetprop11561.dita
    db/derby/docs/trunk/src/devguide/cdevstandardsxml.dita
    db/derby/docs/trunk/src/devguide/rdevtrademderby.dita
    db/derby/docs/trunk/src/getstart/cgsintro.dita
    db/derby/docs/trunk/src/getstart/rgstrademderby.dita
    db/derby/docs/trunk/src/ref/crefjdbc12657.dita
    db/derby/docs/trunk/src/ref/rrefproper81359.dita
    db/derby/docs/trunk/src/ref/rreftrademderby.dita
    db/derby/docs/trunk/src/tools/rtoolstrademderby.dita
    db/derby/docs/trunk/src/tuning/rtuntrademderby.dita

Modified: db/derby/docs/trunk/src/adminguide/cadminapps811695.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminapps811695.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminapps811695.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminapps811695.dita Fri Apr  2 14:26:36 2010
@@ -21,18 +21,15 @@ limitations under the License.
 <title>Enabling the encrypted user ID and password security mechanism</title>
 <prolog><metadata>
 <keywords><indexterm>Encrypted User ID and password<indexterm>using with
Network
-Server</indexterm></indexterm><indexterm>IBM Java Cryptography Extension
(JCE)</indexterm>
-<indexterm>ibmjcefw.jar</indexterm><indexterm>ibmjceprovider.jar</indexterm>
-<indexterm>ibmpkderby.jar</indexterm><indexterm>ibmpkcs11.jar</indexterm>
+Server</indexterm></indexterm><indexterm>Java Cryptography Extension (JCE)</indexterm>
 </keywords>
 </metadata></prolog>
 <conbody>
 <p>To use the encrypted user ID and password security mechanism,
-you need a Java environment whith an JCE (Java Cryptography Extension)
+you need a Java environment with a JCE (Java Cryptography Extension)
 which supports the Diffie-Hellman algorithm with a public prime of
-256 bits. Sun's <ph><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 2 Platform, Standard Edition, Version
-1.4 (J2SE)</ph> and later requires a public prime of 512 bits or
+256 bits. The Sun Java Platform, Standard Edition, Version
+1.4 (J2SE) and later requires a public prime of 512 bits or
 more. An alternative mechanism if the 256 bit public prime is not
 supported, is <i>STRONG_PASSWORD_SUBSTITUTE_SECURITY</i>.
 </p>

Modified: db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsclientsecurity.dita Fri Apr  2 14:26:36 2010
@@ -73,8 +73,8 @@ colwidth="170*"/><colspec colname="col3"
 uses the SHA1PRNG algorithm to generate a random number that gets exchanged
 between client and server. If you need to use this security mechanism, make
 sure that support for the SHA1PRNG algorithm is available in the JCE provider
-available with your JVM. For example, it is available with JVM version 1.4.1
-and higher from Sun and with JVM version 1.4.2 and higher from IBM.</entry>
+available with your Java Virtual Machine (JVM). This support is
+available with JVM version 1.4.2 and higher.</entry>
 </row>
 <row>
 <entry colname="col1">Encrypted user id and encrypted password</entry>
@@ -87,4 +87,4 @@ the Diffie-Hellman algorithm with a publ
 </tgroup>
 </table> </p>
 </conbody>
-</concept>
\ No newline at end of file
+</concept>

Modified: db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsthenetworkserverandjvms.dita Fri Apr  2 14:26:36
2010
@@ -23,9 +23,9 @@ limitations under the License.
 <title>The Network Server and JVMs</title>
 <prolog></prolog>
 <conbody>
-<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
Server is compatible with <ph><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 2 Platform, Standard Edition, v 1.4.2
-(J2SE)</ph> and above.</p>
+<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> Network
Server
+is compatible with Java Platform, Standard Edition, v 1.4.2
+(J2SE) and above.</p>
 </conbody>
 </concept>
 

Modified: db/derby/docs/trunk/src/adminguide/cadminssl.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminssl.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminssl.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminssl.dita Fri Apr  2 14:26:36 2010
@@ -34,12 +34,12 @@ conref="../conrefs.dita#prod/productshor
 supports network security with Secure Socket Layer/Transport Layer
 Security (SSL/TLS).
 </p>
-<p>With SSL/TLS, the client/server communication protcol is encrypted
+<p>With SSL/TLS, the client/server communication protocol is encrypted
 and both the client and the server may independently of each other
 require certificate based authentication of the other part.
 </p><p> It is assumed that the reader is somewhat familiar with SSL,
 key pairs and certificates. This documentation is also based on the
-Sun JDK and its <codeph>keytool</codeph> application.
+Java Development Kit (JDK) and its <codeph>keytool</codeph> application.
 </p><p> For the remainder of this section, the term <i>SSL</i> is
used
 for SSL/TLS and the term <i>peer</i> is used for the other part of the
 communication (The server's <i>peer</i> is the client and vice versa).
@@ -73,4 +73,4 @@ report protocol errors.</i>
 </note>
 </p>
 </conbody>
-</concept>
\ No newline at end of file
+</concept>

Modified: db/derby/docs/trunk/src/adminguide/radmintrademderby.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radmintrademderby.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radmintrademderby.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radmintrademderby.dita Fri Apr  2 14:26:36 2010
@@ -28,8 +28,8 @@ International Business Machines Corporat
 or both.</p>
 <p>Microsoft, Windows, Windows NT, and the Windows logo are trademarks of
 Microsoft Corporation in the United States, other countries, or both. </p>
-<p>Java and all Java-based trademarks are trademarks of Sun Microsystems,
-Inc. in the United States, other countries, or both.</p>
+<p>Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.</p>
 <p>UNIX is a registered trademark of The Open Group in the United States and
 other countries.</p>
 <p>Other company, product, or service names may be trademarks or service marks

Modified: db/derby/docs/trunk/src/devguide/cdevcsecure67151.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevcsecure67151.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure67151.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure67151.dita Fri Apr  2 14:26:36 2010
@@ -38,8 +38,9 @@ the following encryption algorithms.</sh
 <li>It requires exactly one initialization parameter, an initialization vector
 of type <i>javax.crypto.spec.IvParameterSpec</i></li>
 <li>It can use <i>javax.crypto.spec.SecretKeySpec</i> to represent its
key</li>
-</ul>  <p>For example, the algorithm <i>Blowfish</i> implemented
in the Sun
-JCE package fulfills these requirements.</p></li>
+</ul>  <p>For example, the algorithm <i>Blowfish</i> implemented
in the
+Java Cryptography Extension (JCE) packages (<i>javax.crypto.*</i>) fulfills
+these requirements.</p></li>
 </ul>
 <p>By Java convention, an encryption algorithm is specified like this:</p>
 <codeblock><b><i>algorithmName</i>/<i>feedbackMode</i>/<i>padding</i></b></codeblock>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita Fri Apr  2 14:26:36 2010
@@ -21,19 +21,19 @@ limitations under the License.
 <concept id="cdevdvlp14839" xml:lang="en-us">
 <title>Application development overview</title>
 <shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> application
-developers use JDBC, the application programming interface that makes it possible
+developers use the Java Database Connectivity (JDBC) API, the application
+programming interface that makes it possible
 to access relational databases from Java programs.</shortdesc>
 <prolog></prolog>
 <conbody>
-<p>The JDBC API is part of the <tm tmclass="special" tmowner="Sun Microsystems,
Inc."
-tmtype="tm" trademark="Java">Java</tm> 2 Platform, Standard Edition and is
+<p>The JDBC API is part of the Java Platform, Standard Edition and is
 not specific to <ph conref="../conrefs.dita#prod/productshortname"></ph>.
 It consists of the <i>java.sql</i> and <i>javax.sql</i> packages,
which is
 a set of classes and interfaces that make it possible to access databases
 (from a number of different vendors, not just <ph conref="../conrefs.dita#prod/productshortname"></ph>)
 from a Java application.</p>
 <p>To develop <ph conref="../conrefs.dita#prod/productshortname"></ph>
applications
-successfully, you will need to learn JDBC. This section does not teach you
+successfully, you will need to learn the JDBC API. This section does not teach you
 how to program with the JDBC API.</p>
 <p>This section covers the details of application programming that are specific
 to <ph conref="../conrefs.dita#prod/productshortname"></ph> applications.
@@ -44,7 +44,7 @@ JDBC driver and how to work with <ph con
 connection URL to accomplish various tasks. It also covers essential <ph conref="../conrefs.dita#prod/productshortname"></ph>
concepts
 such as the <ph conref="../conrefs.dita#prod/productshortname"></ph> system.</p>
 <p>You will find reference information about the particulars of <ph conref="../conrefs.dita#prod/productshortname"></ph>'s
-implementation of JDBC in the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>.
</p>
+implementation of the JDBC API in the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>.
</p>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> application
developers
 will need to learn SQL. <i>SQL</i> is the standard query language used with
 relational databases and is not tied to a particular programming language.
@@ -57,8 +57,8 @@ is a subset of full SQL-92 specified by 
 nearly all major DBMSs today. This chapter does not teach you SQL. You will
 find reference information about the particulars of <ph conref="../conrefs.dita#prod/productshortname"></ph>'s
 implementation of SQL in the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>.</p>
-<p><ph conref="../conrefs.dita#prod/productshortname"></ph> implements
JDBC
-that allows <ph conref="../conrefs.dita#prod/productshortname"></ph> to serve
-as a resource manager in a J2EE compliant system.</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> implements
the JDBC
+API so as to allow <ph conref="../conrefs.dita#prod/productshortname"></ph> to
+serve as a resource manager in a Java EE compliant system.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevsetprop11561.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevsetprop11561.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevsetprop11561.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevsetprop11561.dita Fri Apr  2 14:26:36 2010
@@ -29,8 +29,7 @@ limitations under the License.
 <conbody>
 <p>You can set properties programmatically -- either in application code before
 booting the <ph conref="../conrefs.dita#prod/productshortname"></ph> driver or
-as a command-line option to the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Virtual
+as a command-line option to the Java Virtual
 Machine (JVM) when booting the application that starts up
 <ph conref="../conrefs.dita#prod/productshortname"></ph>. When you set
 properties programmatically, these properties persist only for the duration of

Modified: db/derby/docs/trunk/src/devguide/cdevstandardsxml.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevstandardsxml.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandardsxml.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandardsxml.dita Fri Apr  2 14:26:36 2010
@@ -49,7 +49,7 @@ the Java classpath. If either the parser
 conref="../conrefs.dita#prod/productshortname"></ph> disallows any XML-related
 operations.  </p>
 <section><title>Classpath and version issues</title>
-<p>Most Java virtual machines (JVMs) that are version 1.4 or later have
+<p>Most Java Virtual Machines (JVMs) that are version 1.4 or later have
 a JAXP parser embedded in the JVM. If you are using one of these JVMs, you
 may not need to add any classes to your classpath. Some exceptions exist:</p>
 <ul>
@@ -61,9 +61,10 @@ scope="external">http://java.sun.com/j2s
 use this mechanism, download and install a binary distribution of Xalan from
 Apache and set the system property <codeph>java.endorsed.dirs</codeph> to point
 to the Xalan installation directory.</li>
-<li>In Sun JVMs later than version 1.4, Sun has renamed the JAXP packages so that
-<ph conref="../conrefs.dita#prod/productshortname"></ph> cannot access them.
If
-you are using a Sun JVM later than version 1.4, download and install a binary
+<li>After JVM version 1.4, Sun renamed the JAXP packages. 
+<ph conref="../conrefs.dita#prod/productshortname"></ph> cannot find these
+renamed packages. If you are using a Sun JVM later than version 1.4, download
+and install a binary
 distribution of Xalan from Apache and place the <codeph>xalan.jar</codeph> file
 in your classpath. The <codeph>xalan.jar</codeph> file automatically puts into
 the classpath the other required jars that are in the same directory.</li>

Modified: db/derby/docs/trunk/src/devguide/rdevtrademderby.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevtrademderby.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevtrademderby.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevtrademderby.dita Fri Apr  2 14:26:36 2010
@@ -28,8 +28,8 @@ International Business Machines Corporat
 or both.</p>
 <p>Microsoft, Windows, Windows NT, and the Windows logo are trademarks of
 Microsoft Corporation in the United States, other countries, or both. </p>
-<p>Java and all Java-based trademarks are trademarks of Sun Microsystems,
-Inc. in the United States, other countries, or both.</p>
+<p>Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.</p>
 <p>UNIX is a registered trademark of The Open Group in the United States and
 other countries.</p>
 <p>Other company, product, or service names may be trademarks or service marks

Modified: db/derby/docs/trunk/src/getstart/cgsintro.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsintro.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsintro.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsintro.dita Fri Apr  2 14:26:36 2010
@@ -22,9 +22,8 @@ limitations under the License.
 <title>Introduction to Derby</title>
 <shortdesc>Welcome to <ph conref="../conrefs.dita#prod/productshortname"></ph>!
<ph
 conref="../conrefs.dita#prod/productshortname"></ph> is a full-featured, open
-source relational database management system (RDBMS) that is based on <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm>
and
-SQL.</shortdesc>
+source relational database management system (RDBMS) that is based on Java
+technology and SQL.</shortdesc>
 <conbody>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> is written
and
 implemented completely in the Java programming language. <ph conref="../conrefs.dita#prod/productshortname"></ph>
provides

Modified: db/derby/docs/trunk/src/getstart/rgstrademderby.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/rgstrademderby.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/rgstrademderby.dita (original)
+++ db/derby/docs/trunk/src/getstart/rgstrademderby.dita Fri Apr  2 14:26:36 2010
@@ -29,8 +29,8 @@ International Business Machines Corporat
 or both.</p>
 <p>Microsoft, Windows, Windows NT, and the Windows logo are trademarks of
 Microsoft Corporation in the United States, other countries, or both. </p>
-<p>Java and all Java-based trademarks are trademarks of Sun Microsystems,
-Inc. in the United States, other countries, or both.</p>
+<p>Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.</p>
 <p>UNIX is a registered trademark of The Open Group in the United States and
 other countries.</p>
 <p>Other company, product, or service names may be trademarks or service marks

Modified: db/derby/docs/trunk/src/ref/crefjdbc12657.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefjdbc12657.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefjdbc12657.dita (original)
+++ db/derby/docs/trunk/src/ref/crefjdbc12657.dita Fri Apr  2 14:26:36 2010
@@ -28,15 +28,19 @@ with a built-in JDBC driver. </shortdesc
 </metadata></prolog>
 <conbody>
 <p>That makes the JDBC API the only API for working with <ph conref="../conrefs.dita#prod/productshortname"></ph>
databases.
-The driver is a native protocol all-Java driver (type number four of types
-defined by Sun).</p>
+The driver is a native-protocol fully Java technology-enabled driver (type
+number four of types described in <i><xref format="html"
+href="http://java.sun.com/products/jdbc/driverdesc.html"
+scope="external">http://java.sun.com/products/jdbc/driverdesc.html</xref></i>).
+</p>
 <p>This section provides reference information about <ph conref="../conrefs.dita#prod/productshortname"></ph>'s
 implementation of the JDBC API and documents the way it conforms to the JDBC
 3.0 and 4.0 APIs.</p>
 <p>See the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite>
for
 task-oriented instructions on working with the driver.</p>
-<p>This JDBC driver implements the standard JDBC interface defined by Sun.
-When invoked from an application running in the same JVM as <ph conref="../conrefs.dita#prod/productshortname"></ph>,
+<p>This JDBC driver implements the standard JDBC interfaces.
+When invoked from an application running in the same Java Virtual Machine (JVM)
+as <ph conref="../conrefs.dita#prod/productshortname"></ph>,
 the JDBC driver supports connections to a <ph conref="../conrefs.dita#prod/productshortname"></ph>
database
 in embedded mode. No network transport is required to access the database.
 In client/server mode, the client application dispatches JDBC requests to

Modified: db/derby/docs/trunk/src/ref/rrefproper81359.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefproper81359.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefproper81359.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefproper81359.dita Fri Apr  2 14:26:36 2010
@@ -49,9 +49,6 @@ consideration, of course, the memory nee
 well). For example, using the default page size of 4K, a page cache size of 2000
 pages will require at least 8 MB of memory (and probably more, given the
 overhead).</p>
-<p>For a simple application (no GUI), using the Sun 1.1.7 JVM on Windows NT and
-using the -mx96m option (which allows 96 MB for the Java heap), it is possible
-to have a page cache size of 10,000 pages (approximately 40 MB).</p>
 <p>The minimum value is 40 pages. If you specify a lower value,
 <ph conref="../conrefs.dita#prod/productshortname"></ph> uses the default
 value.</p> </section>

Modified: db/derby/docs/trunk/src/ref/rreftrademderby.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreftrademderby.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreftrademderby.dita (original)
+++ db/derby/docs/trunk/src/ref/rreftrademderby.dita Fri Apr  2 14:26:36 2010
@@ -28,8 +28,8 @@ International Business Machines Corporat
 or both.</p>
 <p>Microsoft, Windows, Windows NT, and the Windows logo are trademarks of
 Microsoft Corporation in the United States, other countries, or both. </p>
-<p>Java and all Java-based trademarks are trademarks of Sun Microsystems,
-Inc. in the United States, other countries, or both.</p>
+<p>Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.</p>
 <p>UNIX is a registered trademark of The Open Group in the United States and
 other countries.</p>
 <p>Other company, product, or service names may be trademarks or service marks

Modified: db/derby/docs/trunk/src/tools/rtoolstrademderby.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolstrademderby.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolstrademderby.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolstrademderby.dita Fri Apr  2 14:26:36 2010
@@ -28,8 +28,8 @@ International Business Machines Corporat
 or both.</p>
 <p>Microsoft, Windows, Windows NT, and the Windows logo are trademarks of
 Microsoft Corporation in the United States, other countries, or both. </p>
-<p>Java and all Java-based trademarks are trademarks of Sun Microsystems,
-Inc. in the United States, other countries, or both.</p>
+<p>Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.</p>
 <p>UNIX is a registered trademark of The Open Group in the United States and
 other countries.</p>
 <p>Other company, product, or service names may be trademarks or service marks

Modified: db/derby/docs/trunk/src/tuning/rtuntrademderby.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/rtuntrademderby.dita?rev=930280&r1=930279&r2=930280&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/rtuntrademderby.dita (original)
+++ db/derby/docs/trunk/src/tuning/rtuntrademderby.dita Fri Apr  2 14:26:36 2010
@@ -28,8 +28,8 @@ International Business Machines Corporat
 or both.</p>
 <p>Microsoft, Windows, Windows NT, and the Windows logo are trademarks of
 Microsoft Corporation in the United States, other countries, or both. </p>
-<p>Java and all Java-based trademarks are trademarks of Sun Microsystems,
-Inc. in the United States, other countries, or both.</p>
+<p>Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.</p>
 <p>UNIX is a registered trademark of The Open Group in the United States and
 other countries.</p>
 <p>Other company, product, or service names may be trademarks or service marks



Mime
View raw message