Merge "Merge remote-tracking branch 'gerrit/dev' into 5.5" into refs/staging/5.5

1 files changed, 9 insertions, 9 deletions

diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index a38a6bdd..15d13eca 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -10,15 +10,15 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
 ** Documentation License version 1.3 as published by the Free Software
 ** Foundation and appearing in the file included in the packaging of
-** this file.  Please review the following information to ensure
+** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
 ** will be met: http://www.gnu.org/copyleft/fdl.html.
 ** $QT_END_LICENSE$
@@ -58,7 +58,7 @@
     Qt documentation is licensed under the terms of the \l{GNU Free Documentation
     License (FDL)} version 1.3, as published by the Free Software Foundation.
     Alternatively, you may use the documentation in accordance with the terms
-    contained in a written agreement between you and Digia.
+    contained in a written agreement between you and The Qt Company.
 
     See \l{http://qt.io/licensing/} for an overview of Qt licensing, and
     \l{http://www.qt.io/download/} for details on what is included in each license
@@ -68,7 +68,7 @@
 
     To purchase a Qt license, visit \l{http://www.qt.io/download/}.
 
-    For further information and assistance about Qt licensing,
+   For further information and assistance about Qt licensing,
     please contact our sales via one of the following channels:
 
     \table
@@ -468,7 +468,7 @@
         notice, this list of conditions and the following disclaimer in the
         documentation and/or other materials provided with the distribution.\br
       * Neither the name of Research In Motion Limited nor the
-        names of its contributors may be used to endorse or promote products
+        contributors may be used to endorse or promote products derived
         derived from this software without specific prior written permission.
 
     THIS SOFTWARE IS PROVIDED BY Research In Motion Limited ''AS IS'' AND ANY