Fixup the licensing pages a bit more

This should help make things a bit clearer.
Also deleted the credits page, as it's hopelessly
outdated and impossible to maintain with open governance.

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

5 files changed, 95 insertions, 119 deletions

diff --git a/doc/src/legal/commercialeditions.qdoc b/doc/src/legal/commercialeditions.qdoc
deleted file mode 100644
index ece063b2..00000000
--- a/doc/src/legal/commercialeditions.qdoc
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** 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.
-**
-** 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
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \page commercialedition.html
-    \title Qt Commercial Edition
-    \ingroup licensing
-    \brief Information about the license and features of the Commercial Edition.
-
-    Qt can be used to develop closed source software if you obtain a commercial
-    license.
-
-    If you want to develop Free or Open Source software for release using a recognized
-    Open Source license, you can use the \l{Open Source Versions of Qt}.
-
-    The following table is a summary of the licenses under which Qt is made available.
-
-    \table
-    \row \li \b{Qt Commercial Developer License}
-    \li The Qt Commercial Developer License is the appropriate version to use for the
-    development of proprietary and/or commercial software where the developer does not
-    wish to share or distribute any source code of the Qt libraries or otherwise comply
-    with the terms of the \l{GNU Lesser General Public License (LGPL)}{GNU Lesser General
-    Public License version 2.1} or \l{GNU General Public License (GPL)}{GNU GPL version
-    3.0}.
-    \row \li \b{Qt GNU LGPL v. 2.1}
-    \li This version of Qt is appropriate for the development of Qt applications
-    (proprietary or open source) provided you can comply with the terms and conditions
-    contained in the \l{GNU Lesser General Public License (LGPL)}{GNU LGPL version 2.1}.
-    \row \li \b{Qt GNU GPL v. 3.0}
-    \li This version of Qt is appropriate for the development of Qt applications where
-    you wish to use such applications in combination with software subject to the terms
-    of the GNU General Public License version 3.0 or where you are otherwise willing to
-    comply with the terms of the
-    \l{GNU General Public License (GPL)}{GNU General Public License version 3.0}.
-    \endtable
-
-    Please see the \l{Supported Platforms}{list of supported
-    platforms} for up-to-date information about the various platforms
-    and compilers that Qt supports.
-
-    On the Qt Commercial Web site, you can find information
-    on \l{Qt Licensing Overview}.
-
-    \section1 Purchasing and Sales Information
-
-    To purchase or further information and assistance about Qt Commercial,
-    please contact Digia Qt Commercial sales.
-
-    For further information and assistance, please contact the Qt sales team
-    via one of the following channels:
-
-    \table
-    \row \li Web: \li \l{http://qt.digia.com/contact-us}
-    \row \li Phone, U.S. office (for sales in North America): \li \b{+1 408 433 9320}
-    \row \li Phone, Norway office (for sales in the rest of the world): \li \b{+47 2108 0420}
-    \endtable
-*/
diff --git a/doc/src/legal/commerciallicense.qdoc b/doc/src/legal/commerciallicense.qdoc
new file mode 100644
index 00000000..b7ab260d
--- /dev/null
+++ b/doc/src/legal/commerciallicense.qdoc
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** 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.
+**
+** 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
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page commerciallicense.html
+    \title Qt Commercial License
+    \brief Information about the commercial licensing of Qt
+
+    Qt licensed under our commercial license agreement is appropriate for development
+    of proprietary/commercial software where you do not want to share any source code
+    with third parties or otherwise cannot comply with the terms of the
+    \l{GNU Lesser General Public License (LGPL)}{GNU LGPL version 2.1} or
+    \l{GNU General Public License (GPL)}{GNU GPL version 3.0}.
+
+    You can find more information on the \l{Qt Licensing Overview} of
+    the \l{http://qt.digia.com}{Digia Qt} Web site.
+
+    \section1 Purchasing and Sales Information
+
+    To purchase or further information and assistance about Qt Commercial licensing,
+    please contact Digia Qt sales via one of the following channels:
+
+    \table
+    \row \li Web: \li \l{http://qt.digia.com/contact-us}
+    \row \li Phone, U.S. office (for sales in North America): \li \b{+1 408 433 9320}
+    \row \li Phone, Norway office (for sales in the rest of the world): \li \b{+47 2108 0420}
+    \endtable
+*/
diff --git a/doc/src/legal/gpl.qdoc b/doc/src/legal/gpl.qdoc
index 02d52724..8623f5ff 100644
--- a/doc/src/legal/gpl.qdoc
+++ b/doc/src/legal/gpl.qdoc
@@ -26,45 +26,39 @@
 ****************************************************************************/
 
 /*! \page gpl.html
-\title GNU General Public License (GPL)
-\ingroup licensing
-\brief About the GPL license used for Qt.
+    \title GNU General Public License (GPL)
+    \brief About the GPL license used for Qt.
 
-The Qt Toolkit is Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\br
-Contact: http://www.qt-project.org/legal
+    Qt is available under the GPL (version 3).
 
-Qt is available under the GPL.
+    The Qt Toolkit is Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
+    Contact: \l{http://www.qt-project.org/legal}
 
-\section1 The GNU General Public License (Version 3)
+    Reference: \l{GNU General Public License}
 
-Reference: \l{GNU General Public License}
-
-\snippet doc/src/snippets/code/doc_src_gpl.qdoc GPL v3
+    \snippet doc/src/snippets/code/doc_src_gpl.qdoc GPL v3
 */
 
 /*! \page lgpl.html
-\title GNU Lesser General Public License (LGPL)
-\ingroup licensing
-\brief About the LGPL license used for Qt.
-
-The Qt Toolkit is Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).\br
-Contact: http://www.qt-project.org/legal
+    \title GNU Lesser General Public License (LGPL)
+    \brief About the LGPL license used for Qt.
 
-Qt is available under the LGPL.
+    Qt is available under the LGPL (version 2.1).
 
-\section1 The GNU Lesser General Public License (Version 2.1)
+    The Qt Toolkit is Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
+    Contact: http://www.qt-project.org/legal
 
-Reference: \l{GNU Lesser General Public License, version 2.1}
+    Reference: \l{GNU Lesser General Public License, version 2.1}
 
-\snippet doc/src/snippets/code/doc_src_lgpl.qdoc LGPL v2.1
+    \snippet doc/src/snippets/code/doc_src_lgpl.qdoc LGPL v2.1
 
-\section1 Digia Qt LGPL Exception version 1.1
+    \section1 Digia Qt LGPL Exception version 1.1
 
-As a special exception to the GNU Lesser General Public License version 2.1,
-the object code form of a "work that uses the Library" may incorporate material
-from a header file that is part of the Library.  You may distribute such object
-code under terms of your choice, provided that the incorporated material
-(i) does not exceed more than 5% of the total size of the Library;  and
-(ii) is limited to numerical parameters, data structure layouts, accessors,
-macros, inline functions and templates.
+    As a special exception to the GNU Lesser General Public License version 2.1,
+    the object code form of a "work that uses the Library" may incorporate material
+    from a header file that is part of the Library.  You may distribute such object
+    code under terms of your choice, provided that the incorporated material
+    (i) does not exceed more than 5% of the total size of the Library;  and
+    (ii) is limited to numerical parameters, data structure layouts, accessors,
+    macros, inline functions and templates.
 */
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 6ba68ddf..224fe7de 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -33,7 +33,8 @@
     Qt is available under three different licensing options designed to accommodate
     the needs of our various users.
 
-    Qt licensed under our commercial license agreement is appropriate for development
+    Qt licensed under our \l{Qt Commercial License}{commercial license agreement}
+    is appropriate for development
     of proprietary/commercial software where you do not want to share any source code
     with third parties or otherwise cannot comply with the terms of the GNU LGPL
     version 2.1 or GNU GPL version 3.0.
@@ -50,11 +51,21 @@
 
     Please see \l{http://qt.digia.com/licensing} for an overview of Qt licensing.
 
+    \section1 Purchasing and Sales Information
+
     To purchase or further information and assistance about Qt commercial licensing,
-    please contact \l{http:://qt.digia.com/contact-us}{Digia Qt sales}.
+    please contact Digia Qt sales via one of the following channels:
+
+    \table
+    \row \li Web: \li \l{http://qt.digia.com/contact-us}
+    \row \li Phone, U.S. office (for sales in North America): \li \b{+1 408 433 9320}
+    \row \li Phone, Norway office (for sales in the rest of the world): \li \b{+47 2108 0420}
+    \endtable
+
+    \section1 Additional information
 
-    The additional documents below include information about other licenses and related
-    documents used by third party code in Qt.
+    The documents below list related documents, such as information about Trademark and other
+    licenses used in parts of Qt.
 
     \generatelist{related}
 */
@@ -69,7 +80,7 @@
     Qt contains some code that is not provided under the
     \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
+    \l{Qt Commercial License}, but rather under
     specific licenses from the original authors.
     This page lists the licenses used, names the authors, and links
     to the places where it is used.
diff --git a/doc/src/legal/opensourceedition.qdoc b/doc/src/legal/opensourcelicense.qdoc
index 8df2aaae..07d55817 100644
--- a/doc/src/legal/opensourceedition.qdoc
+++ b/doc/src/legal/opensourcelicense.qdoc
@@ -26,11 +26,11 @@
 ****************************************************************************/
 
 /*!
-    \page opensourceedition.html
+    \page opensourcelicense.html
 
-    \title Open Source Versions of Qt
+    \title Open Source Licensing of Qt
     \ingroup licensing
-    \brief Information about the license and features of the Open Source Edition.
+    \brief Information about open source licensing of Qt.
 
     Free and Open Source Software (FOSS) is software that comes with a license
     that gives users certain rights. In particular the right to use the
@@ -54,7 +54,7 @@
 
     The Open Source Edition can be downloaded from the \l{Opensource Downloads} page.
 
-    More information on Free and Open Source software is available online:
+    More information on Free and Open Source software is available online.
 
     \list
     \li GNU GPL, GNU LGPL: \l http://www.gnu.org/
@@ -69,4 +69,5 @@
 
     If you are in doubt what edition of Qt is right for your project,
     please contact Digia at \l http://qt.digia.com/contact-us.
+
 */