Changeset 846 for trunk/doc/src/legal/opensourceedition.qdoc

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• doc/src/legal/opensourceedition.qdoc (modified) (6 diffs)

trunk/doc/src/legal/opensourceedition.qdoc

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -7 +7 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** GNU Free Documentation License
+** 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.
 **
 ** If you have questions regarding the use of this file, please contact
@@ -47 +33 @@
     \brief Information about the license and features of the Open Source Edition.
 
-    Free (or open source) software is software that comes with a license
+    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
     software, to modify it, to obtain its source, and to pass it on (under
     the same terms). Notice that the term "free" is about rights, not
-    money. The Free Software Foundation (creators of the GNU GPL) speaks
+    money. The Free Software Foundation, the creator of the GNU GPL, speaks
     of free in this context as in "free speech", not as in "no cost".
 
@@ -58 +44 @@
     (version 3) and the \l{GNU Lesser General Public License (LGPL)} (version 2.1).
     You can use this edition of Qt to create and distribute software with licenses
-    that are compatible to these free software licenses.
+    that are compatible with these free software licenses.
+
+    Additionally, the \l{Qt Examples}{examples} included with Qt are provided under
+    the terms of the \l{New and Modified BSD Licenses}{Modified BSD License}.
 
     The support of open source with the Open Source Versions of Qt has enabled large
@@ -74 +63 @@
 
     \list
-    \o GNU GPL: \l http://www.gnu.org/.
-    \o Open Source licensing: \l http://www.opensource.org/.
+    \o GNU GPL, GNU LGPL: \l http://www.gnu.org/
+    \o Open Source licensing: \l http://www.opensource.org/
     \endlist
 
@@ -86 +75 @@
 
     If you are in doubt what edition of Qt is right for your project,
-    please contact
-    \l{mailto:qt-info@nokia.com}{qt-info@nokia.com}.
-
+    please contact \l{mailto:qt-info@nokia.com}{qt-info@nokia.com}.
 */