diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2013-11-04 18:02:06 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-05 14:16:36 +0100 |
commit | a611ec54c4d6e3b98596867a616360f7679c03a0 (patch) | |
tree | 2a2d1b5eec178bce7e3491f09d2dae51705e24e2 | |
parent | 7919a2e29fa0e48b3426a87f234967aad3296262 (diff) |
Doc: Added GNU Free Documentation License link from licenses page.
-snippet already existed, but the page which quotes the snippet doesn't
exist.
Task-number: QTBUG-34569
Change-Id: I9c1de16e09ba309a8076d6814742682adff6112c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r-- | doc/src/external-resources.qdoc | 5 | ||||
-rw-r--r-- | doc/src/legal/fdl.qdoc | 44 | ||||
-rw-r--r-- | doc/src/legal/licenses.qdoc | 8 |
3 files changed, 55 insertions, 2 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index bd1084cf2..4e3e7524c 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -88,3 +88,8 @@ \externalpage https://itunes.apple.com/us/app/qtquicksand/id666273528 \title iTunes: QtQuicksand */ + +/*! + \externalpage http://www.gnu.org/copyleft/fdl.html + \title GNU Free Documentation License +*/ diff --git a/doc/src/legal/fdl.qdoc b/doc/src/legal/fdl.qdoc new file mode 100644 index 000000000..e2a90d0d0 --- /dev/null +++ b/doc/src/legal/fdl.qdoc @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** Copyright (C) 2013 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 fdl.html + \title GNU Free Documentation License (FDL) + \brief About the GPL license used for Qt documentation + + Qt documentation is licensed under the terms of the GNU Free Documentation + License 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. + + The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) and other contributors.\br + Contact: \l{http://www.qt-project.org/legal} + + Reference: \l{GNU Free Documentation License} + + \snippet snippets/code/doc_src_fdl.qdoc FDL v1.3 +*/ diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index a6b503863..89b72eb41 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -29,7 +29,7 @@ \group licensing \title Qt Licensing \brief Information about licenses and licensing issues. - + Qt is available under three different licensing options designed to accommodate the needs of our various users. @@ -49,6 +49,11 @@ version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0. + 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. + Please see \l{http://qt.digia.com/licensing} for an overview of Qt licensing. \section1 Purchasing and Sales Information @@ -1119,4 +1124,3 @@ \endlist */ - |