s/Nokia/Digia/ where applicable.

Change-Id: I5d16968fd8c346af0bf8dcf7c83cb507f4b351f6
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

4 files changed, 8 insertions, 11 deletions

diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index b2d1d866..a36d96cd 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -799,10 +799,10 @@
 
         jquery 1.4.2.js Copyright 2010 John Resig
         This software is dual licensed under the MIT or GPL version 2 licenses.
-        Nokia has used the software herein under the MIT license.
+        Digia has used the software herein under the MIT license.
 
         jquery includes Sizzle.js Copyright 2010 The Dojo Foundaton and is
-        licensed under the MIT, BSD and GPL licenses.  Nokia has used this
+        licensed under the MIT, BSD and GPL licenses.  Digia has used this
         software herein under the MIT license.
 
         The MIT License
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 250dbb78..7ef006df 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -47,12 +47,11 @@
     \l{GNU General Public License (GPL)},
     \l{GNU Lesser General Public License (LGPL)} or the
     \l{Qt Commercial Edition}{Qt Commercial License Agreement}, but rather under
-    specific licenses from the original authors. Some pieces of code were developed
-    by Nokia and others originated from third parties.
+    specific licenses from the original authors.
     This page lists the licenses used, names the authors, and links
     to the places where it is used.
 
-    Nokia gratefully acknowledges these and other contributions
+    Digia gratefully acknowledges these and other contributions
     to Qt. We recommend that programs that use Qt also acknowledge
     these contributions, and quote these license statements in an
     appendix to the documentation.
diff --git a/doc/src/legal/opensourceedition.qdoc b/doc/src/legal/opensourceedition.qdoc
index d1848132..cc888525 100644
--- a/doc/src/legal/opensourceedition.qdoc
+++ b/doc/src/legal/opensourceedition.qdoc
@@ -50,9 +50,7 @@
 
     The support of open source with the Open Source Versions of Qt has enabled large
     successful software projects like KDE to thrive, with thousands of developers
-    around the world using open source versions of Qt at no cost to themselves. With
-    the release of Qt 4, open source versions of Qt became available for Unix/X11,
-    Mac OS X, and Windows platforms.
+    around the world using open source versions of Qt at no cost to themselves.
 
     The Open Source Edition can be downloaded from the \l{Downloads} page.
 
@@ -70,5 +68,5 @@
     in the \l{Qt Licensing Overview} on the Qt website.
 
     If you are in doubt what edition of Qt is right for your project,
-    please contact Digia at \l http://info.qt.digia.com/contact-qt.
+    please contact Digia at \l http://qt.digia.com/contact-us.
 */
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc
index e0d84cd8..fce6364a 100644
--- a/doc/src/legal/trademarks.qdoc
+++ b/doc/src/legal/trademarks.qdoc
@@ -32,8 +32,8 @@
     \ingroup licensing
     \brief Information about trademarks owned by Digia and other organisations.
 
-    Digia, the Digia logo, Qt, and the Qt logo are trademarks of Digia
-    Corporation and/or its subsidiaries in Finland and other countries.
+    Digia, the Digia logo, Qt, and the Qt logo are trademarks of Digia Plc
+    and/or its subsidiaries in Finland and other countries.
 
     \list
     \li Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of