summaryrefslogtreecommitdiffstats
path: root/doc/src/legal
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-10-22 13:56:23 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-10-22 13:56:23 (GMT)
commitc29bc376c957867b57a6dd32549db6ae67be4f60 (patch)
tree082b2f8f2c35e9b2d38c007d3dcfed4092b9faa6 /doc/src/legal
parent2a17ec1b2ef7164a9a5f4bd9b7e5854ed5884376 (diff)
downloadQt-c29bc376c957867b57a6dd32549db6ae67be4f60.zip
Qt-c29bc376c957867b57a6dd32549db6ae67be4f60.tar.gz
Qt-c29bc376c957867b57a6dd32549db6ae67be4f60.tar.bz2
Doc: Updated the Java trademark information.
Checked with Legal.
Diffstat (limited to 'doc/src/legal')
-rw-r--r--doc/src/legal/trademarks.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc
index 42cb7a9..e69d57c 100644
--- a/doc/src/legal/trademarks.qdoc
+++ b/doc/src/legal/trademarks.qdoc
@@ -33,13 +33,13 @@
\brief Information about trademarks owned by Nokia and other organisations.
Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia
-  Corporation and/or its subsidiaries in Finland and other countries.
+ Corporation and/or its subsidiaries in Finland and other countries.
\list
\o Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of
Intel Corporation in the United States, other countries, or both.
- \o Java and all Java-based trademarks are trademarks of Sun Microsystems,
- Inc. in the United States, other countries, or both.
+ \o Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ Other names may be trademarks of their respective owners.
\o Linux is a \reg trademark of Linus Torvalds in the United States, other
countries or both.
\o Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc.,